Author: Brian Kearns <[email protected]>
Branch:
Changeset: r67439:bc9dfce89505
Date: 2013-10-16 16:32 -0400
http://bitbucket.org/pypy/pypy/changeset/bc9dfce89505/
Log: fix ndarray.item() exception in one case
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
@@ -421,8 +421,8 @@
[0] * len(self.get_shape()))
assert isinstance(w_obj, interp_boxes.W_GenericBox)
return w_obj.item(space)
- raise OperationError(space.w_IndexError,
- space.wrap("index out of bounds"))
+ raise OperationError(space.w_ValueError,
+ space.wrap("can only convert an array of size
1 to a Python scalar"))
if space.isinstance_w(w_arg, space.w_int):
if self.is_scalar():
raise OperationError(space.w_IndexError,
diff --git a/pypy/module/micronumpy/test/test_numarray.py
b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -2486,7 +2486,7 @@
assert type(array(True).item()) is bool
assert type(array(3.5).item()) is float
raises(IndexError, "array(3).item(15)")
- raises(IndexError, "array([1, 2, 3]).item()")
+ raises(ValueError, "array([1, 2, 3]).item()")
assert array([3]).item(0) == 3
assert type(array([3]).item(0)) is int
assert array([1, 2, 3]).item(-1) == 3
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
