Fixes #1752
This commit is contained in:
+1
-1
@@ -151,7 +151,7 @@ def with_metaclass(meta, *bases):
|
|||||||
def to_unicode(obj, charset='utf-8', errors='strict'):
|
def to_unicode(obj, charset='utf-8', errors='strict'):
|
||||||
if obj is None:
|
if obj is None:
|
||||||
return None
|
return None
|
||||||
if not isinstance(obj, bytes):
|
if not hasattr(obj, 'decode') and not isinstance(obj, bytes):
|
||||||
return text_type(obj)
|
return text_type(obj)
|
||||||
return obj.decode(charset, errors)
|
return obj.decode(charset, errors)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user