[pypy-commit] pypy numpy-fixes: fix, own tests now pass

[mattip]

Author: mattip <matti.picus at gmail.com>
Branch: numpy-fixes
Changeset: r77264:9e300bd03430
Date: 2015-05-09 23:26 +0300
http://bitbucket.org/pypy/pypy/changeset/9e300bd03430/

Log:	fix, own tests now pass

diff --git a/pypy/module/micronumpy/ufuncs.py b/pypy/module/micronumpy/ufuncs.py
--- a/pypy/module/micronumpy/ufuncs.py
+++ b/pypy/module/micronumpy/ufuncs.py
@@ -287,7 +287,7 @@
                                        axis, out, self.identity, cumulative,
                                        temp)
             if call__array_wrap__:
-                out = space.call_method(w_obj, '__array_wrap__', out)
+                out = space.call_method(obj, '__array_wrap__', out)
             return out
         if cumulative:
             if out:
@@ -301,7 +301,7 @@
             loop.compute_reduce_cumulative(space, obj, out, dtype, self.func,
                                            self.identity)
             if call__array_wrap__:
-                out = space.call_method(w_obj, '__array_wrap__', out)
+                out = space.call_method(obj, '__array_wrap__', out)
             return out
         if out:
             call__array_wrap__ = False
@@ -320,13 +320,13 @@
             out = W_NDimArray.from_shape(space, shape, dtype, w_instance=obj)
             out.implementation.setitem(0, res)
             res = out
-        elif not space.is_w(space.gettypefor(w_obj), space.gettypefor(W_NDimArray)):
+        elif not space.is_w(space.type(w_obj), space.gettypefor(W_NDimArray)):
             # subtypes return a ndarray subtype, not a scalar
             out = W_NDimArray.from_shape(space, [1], dtype, w_instance=obj)
             out.implementation.setitem(0, res)
             res = out
         if call__array_wrap__:
-            res = space.call_method(w_obj, '__array_wrap__', res)
+            res = space.call_method(obj, '__array_wrap__', res)
         return res
 
     def descr_outer(self, space, __args__):