Author: Maciej Fijalkowski <[email protected]>
Branch: matrixmath
Changeset: r49875:71542b62e8e8
Date: 2011-11-28 08:34 +0200
http://bitbucket.org/pypy/pypy/changeset/71542b62e8e8/
Log: find_size no longer raises ValueError
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
@@ -757,12 +757,9 @@
return space.wrap(space.float_w(self.descr_sum(space)) /
self.find_size())
def descr_nonzero(self, space):
- try:
- if self.find_size() > 1:
- raise OperationError(space.w_ValueError, space.wrap(
- "The truth value of an array with more than one element is
ambiguous. Use a.any() or a.all()"))
- except ValueError:
- pass
+ if self.find_size() > 1:
+ raise OperationError(space.w_ValueError, space.wrap(
+ "The truth value of an array with more than one element is
ambiguous. Use a.any() or a.all()"))
return space.wrap(space.is_true(self.get_concrete().eval(
self.start_iter(self.shape)).wrap(space)))
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
