diff options
author | Toshio Kuratomi <toshio@fedoraproject.org> | 2015-02-12 13:55:27 -0800 |
---|---|---|
committer | James Cammarata <jimi@sngx.net> | 2015-02-17 14:32:25 -0600 |
commit | b187676a97e53e07b6944123b67cdc204f869ce6 (patch) | |
tree | 5d6a92cfb6f1559861192e2cbf2f259032452e23 | |
parent | b9f2ee78c187d4ba54f75ec9392f5f93cc1c255b (diff) | |
download | ansible-b187676a97e53e07b6944123b67cdc204f869ce6.tar.gz |
Didn't port isbasestring/isunicodestring from kitchen so switch to isinstance
Conflicts:
v2/ansible/utils/unicode.py
-rw-r--r-- | lib/ansible/utils/unicode.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ansible/utils/unicode.py b/lib/ansible/utils/unicode.py index b2fcf65161..7bd035c007 100644 --- a/lib/ansible/utils/unicode.py +++ b/lib/ansible/utils/unicode.py @@ -116,12 +116,12 @@ def to_unicode(obj, encoding='utf-8', errors='replace', nonstring=None): simple = obj.__str__() except (UnicodeError, AttributeError): simple = u'' - if isbytestring(simple): + if isinstance(simple, str): return unicode(simple, encoding, errors) return simple elif nonstring in ('repr', 'strict'): obj_repr = repr(obj) - if isbytestring(obj_repr): + if isinstance(obj_repr, str): obj_repr = unicode(obj_repr, encoding, errors) if nonstring == 'repr': return obj_repr @@ -221,7 +221,7 @@ def to_bytes(obj, encoding='utf-8', errors='replace', nonstring=None): simple = obj.__unicode__() except (AttributeError, UnicodeError): simple = '' - if isunicodestring(simple): + if isinstance(simple, unicode): simple = simple.encode(encoding, 'replace') return simple elif nonstring in ('repr', 'strict'): @@ -229,7 +229,7 @@ def to_bytes(obj, encoding='utf-8', errors='replace', nonstring=None): obj_repr = obj.__repr__() except (AttributeError, UnicodeError): obj_repr = '' - if isunicodestring(obj_repr): + if isinstance(obj_repr, unicode): obj_repr = obj_repr.encode(encoding, errors) else: obj_repr = str(obj_repr) |