Merge pull request #34 from scikit-hep/issue-check-for-python27-string

fixed scikit-hep/uproot3#183 (comment)
scikit-hep · Jan 30, 2019 · 87df98c · 87df98c
2 parents b32f333 + 401709f
commit 87df98c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/uproot_methods/convert.py b/uproot_methods/convert.py
@@ -49,7 +49,7 @@ def types(cls, obj):
                 for y in types(x, obj):
                     yield y
 
-        if any(x == ("builtins", "bytes") or x == ("builtins", "str") for x in types(obj.__class__, obj)):
+        if any(x == ("builtins", "bytes") or x == ("builtins", "str") or x == ("__builtin__", "str") or x == ("__builtin__", "unicode") for x in types(obj.__class__, obj)):
             return (None, None, "uproot.write.objects.TObjString", "TObjString")
 
         elif isinstance(obj, tuple) and any(x[:2] == ("numpy", "ndarray") for x in types(obj[0].__class__, obj[0])) and any(x[:2] == ("numpy", "ndarray") for x in types(obj[1].__class__, obj[1])) and len(obj[0]) + 1 == len(obj[1]):

diff --git a/uproot_methods/version.py b/uproot_methods/version.py
@@ -30,7 +30,7 @@
 
 import re
 
-__version__ = "0.4.0"
+__version__ = "0.4.1"
 version = __version__
 version_info = tuple(re.split(r"[-\.]", __version__))