Merge pull request #171 from scikit-hep/issue-170

Adapt for Numpy 1.17.0
scikit-hep · Jul 29, 2019 · 509169e · 509169e
2 parents aaa5e70 + 997b107
commit 509169e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/awkward/array/base.py b/awkward/array/base.py
@@ -378,7 +378,7 @@ def _util_toarray(cls, value, defaultdtype, passthrough=None):
         else:
             try:
                 return cls.numpy.frombuffer(value, dtype=getattr(value, "dtype", defaultdtype)).reshape(getattr(value, "shape", -1))
-            except AttributeError:
+            except (AttributeError, TypeError):
                 if len(value) == 0:
                     return cls.numpy.array(value, dtype=defaultdtype, copy=False)
                 else:

diff --git a/awkward/version.py b/awkward/version.py
@@ -4,7 +4,7 @@
 
 import re
 
-__version__ = "0.12.3"
+__version__ = "0.12.4"
 version = __version__
 version_info = tuple(re.split(r"[-\.]", __version__))