Author: Brian Kearns <bdkea...@gmail.com>
Branch:
Changeset: r61647:dc621a04b30d
Date: 2013-02-23 03:21 -0500
http://bitbucket.org/pypy/pypy/changeset/dc621a04b30d/
Log: fix translation after 34f8c678ef62
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
@@ -453,13 +453,17 @@
@unwrap_spec(mode=str)
def descr_choose(self, space, w_choices, mode='raise', w_out=None):
- if not space.is_none(w_out) and not isinstance(w_out, W_NDimArray):
+ if space.is_none(w_out):
+ w_out = None
+ elif not isinstance(w_out, W_NDimArray):
raise OperationError(space.w_TypeError, space.wrap(
"return arrays must be of ArrayType"))
return interp_arrayops.choose(space, self, w_choices, w_out, mode)
def descr_clip(self, space, w_min, w_max, w_out=None):
- if not space.is_none(w_out) and not isinstance(w_out, W_NDimArray):
+ if space.is_none(w_out):
+ w_out = None
+ elif not isinstance(w_out, W_NDimArray):
raise OperationError(space.w_TypeError, space.wrap(
"return arrays must be of ArrayType"))
min = convert_to_array(space, w_min)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
