Merge pull request numpy#9752 from eric-wieser/workaround-numeric-set…

…item BUG: Errors thrown by 0d arrays in setitem are silenced and replaced
bmwiedemann · Sep 24, 2017 · b79b09f · b79b09f
2 parents 91128d9 + 8e26a5d
commit b79b09f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 5 deletions.
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
@@ -36,6 +36,16 @@
 #include <limits.h>
 #include <assert.h>
 
+/* check for sequences, but ignore the types numpy considers scalars */
+static NPY_INLINE npy_bool
+PySequence_NoString_Check(PyObject *op) {
+    return
+        PySequence_Check(op) &&
+        !PyString_Check(op) &&
+        !PyUnicode_Check(op) &&
+        !PyArray_IsZeroDim(op);
+}
+
 /*
  *****************************************************************************
  **                        PYTHON TYPES TO C TYPES                          **
@@ -223,8 +233,7 @@ static int
     if (PyErr_Occurred()) {
         PyObject *type, *value, *traceback;
         PyErr_Fetch(&type, &value, &traceback);
-        if (PySequence_Check(op) && !PyString_Check(op) &&
-                                    !PyUnicode_Check(op)) {
+        if (PySequence_NoString_Check(op)) {
             PyErr_SetString(PyExc_ValueError,
                     "setting an array element with a sequence.");
             Py_DECREF(type);
@@ -450,7 +459,7 @@ UNICODE_setitem(PyObject *op, void *ov, void *vap)
         return convert_to_scalar_and_retry(op, ov, vap, UNICODE_setitem);
     }
 
-    if (!PyBytes_Check(op) && !PyUnicode_Check(op) && PySequence_Check(op)) {
+    if (PySequence_NoString_Check(op)) {
         PyErr_SetString(PyExc_ValueError,
                 "setting an array element with a sequence");
         return -1;
@@ -541,7 +550,7 @@ STRING_setitem(PyObject *op, void *ov, void *vap)
         return convert_to_scalar_and_retry(op, ov, vap, STRING_setitem);
     }
 
-    if (!PyBytes_Check(op) && !PyUnicode_Check(op) && PySequence_Check(op)) {
+    if (PySequence_NoString_Check(op)) {
         PyErr_SetString(PyExc_ValueError,
                 "setting an array element with a sequence");
         return -1;

diff --git a/numpy/ma/tests/test_core.py b/numpy/ma/tests/test_core.py
@@ -8,6 +8,7 @@
 
 __author__ = "Pierre GF Gerard-Marchant"
 
+import sys
 import warnings
 import pickle
 import operator
@@ -20,7 +21,7 @@
 import numpy.core.fromnumeric as fromnumeric
 import numpy.core.umath as umath
 from numpy.testing import (
-    run_module_suite, assert_raises, assert_warns, suppress_warnings
+    run_module_suite, assert_raises, assert_warns, suppress_warnings, dec
     )
 from numpy import ndarray
 from numpy.compat import asbytes, asbytes_nested
@@ -4836,6 +4837,28 @@ def test_immutable(self):
         assert_raises(ValueError, operator.setitem, view.data, (), 1)
         assert_raises(ValueError, operator.setitem, view.mask, (), False)
 
+    @dec.knownfailureif(sys.version_info.major == 2, "See gh-9751")
+    def test_coercion_int(self):
+        a_i = np.zeros((), int)
+        assert_raises(MaskError, operator.setitem, a_i, (), np.ma.masked)
+
+    def test_coercion_float(self):
+        a_f = np.zeros((), float)
+        assert_warns(UserWarning, operator.setitem, a_f, (), np.ma.masked)
+        assert_(np.isnan(a_f[()]))
+
+    @dec.knownfailureif(True, "See gh-9750")
+    def test_coercion_unicode(self):
+        a_u = np.zeros((), 'U10')
+        a_u[()] = np.ma.masked
+        assert_equal(a_u[()], u'--')
+
+    @dec.knownfailureif(True, "See gh-9750")
+    def test_coercion_bytes(self):
+        a_b = np.zeros((), 'S10')
+        a_b[()] = np.ma.masked
+        assert_equal(a_b[()], b'--')
+
 
 def test_masked_array():
     a = np.ma.array([0, 1, 2, 3], mask=[0, 0, 1, 0])