Author: Romain Guillebert <[email protected]>
Branch:
Changeset: r61459:2dab420716b2
Date: 2013-02-19 15:51 +0100
http://bitbucket.org/pypy/pypy/changeset/2dab420716b2/
Log: ndarray.__eq__ should return False when the shapes don't agree
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
@@ -627,7 +627,16 @@
w_remainder = self.descr_mod(space, w_other)
return space.newtuple([w_quotient, w_remainder])
- descr_eq = _binop_impl("equal")
+ _descr_eq = _binop_impl("equal")
+
+ def descr_eq(self, space, w_other):
+ try:
+ return self._descr_eq(space, w_other)
+ except OperationError, e:
+ if e.match(space, space.w_ValueError):
+ return space.w_False
+ raise e
+
descr_ne = _binop_impl("not_equal")
descr_lt = _binop_impl("less")
descr_le = _binop_impl("less_equal")
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
