use other.data explicitly when other is an LArray

gdementen · gdementen · commit 99d3da3ff6c9 · 2015-01-30T11:43:27.000+01:00
diff --git a/larray/core.py b/larray/core.py
@@ -1359,7 +1359,7 @@ def _binop(opname):
         def opmethod(self, other):
             if isinstance(other, LArray):
                 #TODO: first test if it is not already broadcastable
-                other = other.broadcast_with(self)
+                other = other.broadcast_with(self).data
             elif isinstance(other, np.ndarray):
                 pass
             elif not np.isscalar(other):
@@ -1567,6 +1567,8 @@ def __len__(self):
     def __array__(self, dtype=None):
         return self.data
 
+    __array_priority__ = 100
+
 
 
 def parse(s):
