fix for numpy 2.0 wrapping

zm711 · zm711 · commit b367e873f21e · 2024-07-24T13:16:42.000-04:00
diff --git a/quantities/quantity.py b/quantities/quantity.py
@@ -291,14 +291,15 @@ def __array_prepare__(self, obj, context=None):
         return res
 
     def __array_wrap__(self, obj, context=None, return_scalar=False):
-        if not isinstance(obj, Quantity):
-            if tuple(map(int, np.__version__.split('.'))) < (2, 0, 0):
-            # backwards compatibility with numpy-1.3
+        _np_version = tuple(map(int, np.__version__.split('.')))
+        if _np_version < (2, 0, 0):
+            if not isinstance(obj, Quantity):
                 return self.__array_prepare__(obj, context)
             else:
-                return super().__array_wrap__(obj, context, return_scalar)
+                return obj
         else:
-            return obj
+            return super().__array_wrap__(obj, context, return_scalar)
+
 
     @with_doc(np.ndarray.__add__)
     @scale_other_units
