Fix TypeError: 'NoneType' object is not iterable

hgrecco · Nov 17, 2016 · 2cccee1 · 2cccee1
1 parent e009f55
commit 2cccee1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pint/quantity.py b/pint/quantity.py
@@ -1223,7 +1223,7 @@ def tolist(self):
     __array_priority__ = 17
 
     def __array_prepare__(self, obj, context=None):
-        # If this uf is handled by Pint, write it down in the handling dictionary.
+        # If we have no context, assume this is unhandled
         if context is None:
             return obj
 
@@ -1246,6 +1246,10 @@ def __array_prepare__(self, obj, context=None):
         return obj
 
     def __array_wrap__(self, obj, context=None):
+        # If we have no context, assume this is unhandled
+        if context is None:
+            return self.magnitude.__array_wrap__(obj, context)
+
         uf, objs, huh = context
 
         # if this ufunc is not handled by Pint, pass it to the magnitude.

diff --git a/pint/testsuite/test_numpy.py b/pint/testsuite/test_numpy.py
@@ -463,7 +463,6 @@ def test_maximum(self):
         # TODO
         # self.assertEqual(x.units, ureg.m * ureg.s)
 
-    @unittest.expectedFailure
     def test_linalg_solve(self):
         ureg = self.ureg
         A = np.eye(2) * ureg.s