[pypy-commit] pypy numpypy-out: fix merge

[mattip]

Author: mattip
Branch: numpypy-out
Changeset: r53933:593cf5edb34e
Date: 2012-03-22 23:35 +0200
http://bitbucket.org/pypy/pypy/changeset/593cf5edb34e/

Log:	fix merge

diff --git a/pypy/module/micronumpy/interp_numarray.py b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/interp_numarray.py
+++ b/pypy/module/micronumpy/interp_numarray.py
@@ -744,12 +744,12 @@
             broadcast_dims = len(self.res.shape) - len(self.shape)
             chunks = [Chunk(0,0,0,0)] * broadcast_dims + \
                      [Chunk(0, i, 1, i) for i in self.shape]
-            return ra.left.create_slice(chunks)
+            return Chunks(chunks).apply(self.res)
         return ra.left
 
     def force_if_needed(self):
         if self.forced_result is None:
-            self.forced_result = self.compute()
+            self.forced_result = self.compute().get_concrete()
             self._del_sources()
 
     def get_concrete(self):
@@ -979,7 +979,7 @@
 
     def setitem(self, item, value):
         self.invalidated()
-        self.dtype.setitem(self, item, value)
+        self.dtype.setitem(self, item, value.convert_to(self.dtype))
 
     def calc_strides(self, shape):
         dtype = self.find_dtype()
diff --git a/pypy/module/micronumpy/interp_ufuncs.py b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -28,6 +28,7 @@
         return self.identity
 
     def descr_call(self, space, __args__):
+	from interp_numarray import BaseArray
         args_w, kwds_w = __args__.unpack()
         # it occurs to me that we don't support any datatypes that
         # require casting, change it later when we do