Merge branch 'release/v2.1.0'

wolph · Apr 3, 2017 · 70f51fc · 70f51fc
2 parents df4b8e9 + 823bb1e
commit 70f51fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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_)