Author: Brian Kearns <[email protected]>
Branch:
Changeset: r67447:47108b081744
Date: 2013-10-16 17:08 -0400
http://bitbucket.org/pypy/pypy/changeset/47108b081744/
Log: fix ndarray.put() exception
diff --git a/pypy/module/micronumpy/interp_arrayops.py
b/pypy/module/micronumpy/interp_arrayops.py
--- a/pypy/module/micronumpy/interp_arrayops.py
+++ b/pypy/module/micronumpy/interp_arrayops.py
@@ -229,8 +229,8 @@
if index < 0 or index >= arr.get_size():
if constants.MODES[mode] == constants.MODE_RAISE:
- raise OperationError(space.w_ValueError, space.wrap(
- "invalid entry in choice array"))
+ raise OperationError(space.w_IndexError, space.wrap(
+ "index %d is out of bounds for axis 0 with size %d" %
(index, arr.get_size())))
elif constants.MODES[mode] == constants.MODE_WRAP:
index = index % arr.get_size()
else:
diff --git a/pypy/module/micronumpy/test/test_arrayops.py
b/pypy/module/micronumpy/test/test_arrayops.py
--- a/pypy/module/micronumpy/test/test_arrayops.py
+++ b/pypy/module/micronumpy/test/test_arrayops.py
@@ -153,5 +153,5 @@
a = arange(5)
a.put(22, -5, mode='wrap')
assert (a == array([0, 1, -5, 3, 4])).all()
- raises(ValueError, "arange(5).put(22, -5, mode='raise')")
+ raises(IndexError, "arange(5).put(22, -5, mode='raise')")
raises(ValueError, "arange(5).put(22, -5, mode='wrongmode')")
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
