[pypy-commit] pypy numpy-refactor: __radd__ and scalar iterator

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: numpy-refactor
Changeset: r56938:9c99928269e9
Date: 2012-08-30 15:34 +0200
http://bitbucket.org/pypy/pypy/changeset/9c99928269e9/

Log:	__radd__ and scalar iterator

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
@@ -32,7 +32,7 @@
         return self.identity
 
     def descr_call(self, space, __args__):
-        from interp_numarray import BaseArray
+        from interp_numarray import W_NDimArray
         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
@@ -61,7 +61,7 @@
             out = args_w[-1]
         else:
             args_w = args_w[:] + [out]
-        if out is not None and not isinstance(out, BaseArray):
+        if out is not None and not isinstance(out, W_NDimArray):
             raise OperationError(space.w_TypeError, space.wrap(
                                             'output must be an array'))
         return self.call(space, args_w)