BUG: Fix regression of bad error/random behavior in item method

seberg · seberg · commit b84555acc91b · 2013-02-20T16:18:05.000+01:00
Appearently .item() for arrays with size != 1 correctly returned an error
in 1.6., but failed to raise the error (due to missing return) in 1.7.
diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
@@ -633,6 +633,7 @@ array_toscalar(PyArrayObject *self, PyObject *args)
         else {
             PyErr_SetString(PyExc_ValueError,
                     "can only convert an array of size 1 to a Python scalar");
+            return NULL;
         }
     }
     /* Special case of C-order flat indexing... :| */
diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py
@@ -1032,6 +1032,11 @@ def test_recarray_tolist(self, level=rlevel):
         assert_( a[0].tolist() == b[0])
         assert_( a[1].tolist() == b[1])
 
+    def test_nonscalar_item_method(self):
+        # Make sure that .item() fails graciously when it should
+        a = np.arange(5)
+        assert_raises(ValueError, a.item)
+
     def test_char_array_creation(self, level=rlevel):
         a = np.array('123', dtype='c')
         b = np.array(asbytes_nested(['1','2','3']))

Original file line number	Diff line number	Diff line change
`@@ -633,6 +633,7 @@ array_toscalar(PyArrayObject self, PyObject args)`
`633`	`633`	`else {`
`634`	`634`	`PyErr_SetString(PyExc_ValueError,`
`635`	`635`	`"can only convert an array of size 1 to a Python scalar");`
	`636`	`+ return NULL;`
`636`	`637`	`}`
`637`	`638`	`}`
`638`	`639`	`/* Special case of C-order flat indexing... :\| */`