Merge tag 'v2.1.0' into develop

fixed python 2 decoding of unicode strings v2.1.0
wolph · Apr 3, 2017 · 68c0f19 · 68c0f19
2 parents a4e824e + 70f51fc
commit 68c0f19
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,8 +22,6 @@ matrix:
       env: TOXENV=py35
     - python: 'pypy'
       env: TOXENV=pypy
-    - python: 'pypy3'
-      env: TOXENV=pypy3
 
 cache:
   directories:

diff --git a/python_utils/__about__.py b/python_utils/__about__.py
@@ -1,5 +1,5 @@
 __package_name__ = 'python-utils'
-__version__ = '2.0.1'
+__version__ = '2.1.0'
 __author__ = 'Rick van Hattem'
 __author_email__ = 'Wolph@wol.ph'
 __description__ = (

diff --git a/python_utils/converters.py b/python_utils/converters.py
@@ -174,7 +174,7 @@ def to_unicode(input_, encoding='utf-8', errors='replace'):
     >>> to_unicode(Foo)
     "<class 'python_utils.converters.Foo'>"
     '''
-    if hasattr(input_, 'decode'):
+    if isinstance(input_, six.binary_type):
         input_ = input_.decode(encoding, errors)
     else:
         input_ = six.text_type(input_)

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py33, py34, py35, pypy, pypy3, flake8, docs
+envlist = py27, py33, py34, py35, pypy, flake8, docs
 skip_missing_interpreters = True
 
 [testenv]
@@ -9,7 +9,6 @@ basepython =
     py34: python3.4
     py35: python3.5
     pypy: pypy
-    pypy3: pypy3
 deps = -r{toxinidir}/tests/requirements.txt
 
 commands = python setup.py pytest {posargs}