dotlambda
diff --git a/‎.eric4project/quantities.e4q‎
Lines changed: 0 additions & 2 deletions b/‎.eric4project/quantities.e4q‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎.eric4project/quantities.e4t‎
Lines changed: 0 additions & 1 deletion b/‎.eric4project/quantities.e4t‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎quantities/quantity.py‎
Lines changed: 8 additions & 1 deletion b/‎quantities/quantity.py‎
Lines changed: 8 additions & 1 deletion
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE UserProject SYSTEM "UserProject-4.0.dtd">
 <!-- eric4 user project file for project quantities -->
-<!-- Saved: 2009-10-12, 16:52:56 -->
-<!-- Copyright (C) 2009 ,  -->
 <UserProject version="4.0">
 </UserProject>
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Tasks SYSTEM "Tasks-4.2.dtd">
 <!-- eric4 tasks file for project quantities -->
-<!-- Saved: 2009-10-12, 16:52:56 -->
 <Tasks version="4.2">
   <Task priority="1" completed="False" bugfix="False">
     <Summary>TODO: move to constants</Summary>
 
@@ -204,7 +204,7 @@ def astype(self, dtype=None):
     def __array_finalize__(self, obj):
         self._dimensionality = getattr(obj, 'dimensionality', Dimensionality())
 
-    def __array_wrap__(self, obj, context=None):
+    def __array_prepare__(self, obj, context=None):
         if self.__array_priority__ >= Quantity.__array_priority__:
             result = obj.view(type(self))
         else:
@@ -225,6 +225,13 @@ def __array_wrap__(self, obj, context=None):
             print 'https://bugs.launchpad.net/python-quantities'
         return result
 
+    def __array_wrap__(self, obj, context=None):
+        if not isinstance(obj, Quantity):
+            print obj, type(obj)
+            # backwards compatibility with numpy-1.3
+            obj = self.__array_prepare__(obj, context)
+        return obj
+
     @with_doc(np.ndarray.__add__)
     @scale_other_units
     def __add__(self, other):