Author: Matti Picus <matti.pi...@gmail.com>
Branch: numpypy-array_prepare_-array_wrap
Changeset: r67045:995703e4a6b6
Date: 2013-09-22 00:08 +0300
http://bitbucket.org/pypy/pypy/changeset/995703e4a6b6/
Log: fix translation
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
@@ -439,7 +439,8 @@
def descr___array_prepare__(self, space, w_array, w_context):
# stub implementation of __array_prepare__()
- if isinstance(w_array, (W_NDimArray, interp_boxes.Box)):
+ if isinstance(w_array, W_NDimArray) or \
+ isinstance(w_array, interp_boxes.Box):
return w_array
else:
raise OperationError(space.w_TypeError,
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
@@ -232,7 +232,7 @@
if out:
out.set_scalar_value(res)
return out
- if not type(obj) == W_NDimArray:
+ if type(obj) is not W_NDimArray:
#If obj is a subtype of W_NDimArray, return a empty-shape instance
out = W_NDimArray.from_shape(space, [], dtype, w_instance=obj)
out.set_scalar_value(res)
@@ -240,6 +240,7 @@
return res
def call_prepare(self, space, w_out, w_obj, w_result):
+ assert isinstance(w_result, W_NDimArray)
if isinstance(w_out, W_NDimArray):
w_array = space.lookup(w_out, "__array_prepare__")
w_caller = w_out
@@ -248,7 +249,8 @@
w_caller = w_obj
if w_array:
w_retVal = space.get_and_call_function(w_array, w_caller,
w_result, None)
- if not isinstance(w_retVal, (W_NDimArray, interp_boxes.Box)):
+ if not isinstance(w_retVal, W_NDimArray) and \
+ not isinstance(w_retVal, interp_boxes.Box):
raise OperationError(space.w_ValueError,
space.wrap( "__array_prepare__ must return an "
"ndarray or subclass thereof"))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
