diff options
Diffstat (limited to 'bench/is_types.py')
| -rw-r--r-- | bench/is_types.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bench/is_types.py b/bench/is_types.py index 69c029fc..b6da0d25 100644 --- a/bench/is_types.py +++ b/bench/is_types.py @@ -17,11 +17,11 @@ InstanceType = types.InstanceType DictType = dict ListType = list StringType = str -try: unicode +try: str except NameError: UnicodeType = None else: - UnicodeType = unicode + UnicodeType = str # The original implementations, pretty straightforward checks for the @@ -36,7 +36,7 @@ def original_is_List(e): if UnicodeType is not None: def original_is_String(e): - return isinstance(e, (str,unicode,UserString)) + return isinstance(e, (str,UserString)) else: def original_is_String(e): return isinstance(e, (str,UserString)) @@ -58,7 +58,7 @@ def checkInstanceType_is_List(e): if UnicodeType is not None: def checkInstanceType_is_String(e): return isinstance(e, str) \ - or isinstance(e, unicode) \ + or isinstance(e, str) \ or (isinstance(e, types.InstanceType) and isinstance(e, UserString)) else: def checkInstanceType_is_String(e): @@ -84,7 +84,7 @@ if UnicodeType is not None: def cache_type_e_is_String(e): t = type(e) return t is str \ - or t is unicode \ + or t is str \ or (t is types.InstanceType and isinstance(e, UserString)) else: def cache_type_e_is_String(e): @@ -136,7 +136,7 @@ if UnicodeType is not None: t = type(obj) if t is types.InstanceType: t = instanceTypeMap.get(obj.__class__, t) - elif t is unicode: + elif t is str: t = str return t else: |