DEP: Allow high dim boolean assignment, but deprecate it

seberg · seberg · commit 743448139a4b · 2014-07-05T18:02:28.000+02:00
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c
@@ -1796,6 +1796,23 @@ array_assign_subscript(PyArrayObject *self, PyObject *ind, PyObject *op)
             Py_INCREF(op);
             tmp_arr = (PyArrayObject *)op;
         }
+
+        /*
+         * Deprecated case. The old boolean indexing seemed to have some
+         * check to allow wrong dimensional boolean arrays in all cases.
+         * Note that it did *not* allow a wrong number of elements here.
+         */
+        if (PyArray_NDIM(tmp_arr) > 1) {
+            PyArrayObject *unraveled_tmp = tmp_arr;
+            if (DEPRECATE("boolean assignment blah blah.") < 0) {
+                goto fail;
+            }
+            tmp_arr = (PyArrayObject *)PyArray_Ravel(unraveled_tmp, NPY_CORDER);
+            Py_DECREF(unraveled_tmp);
+            if (tmp_arr == NULL) {
+                goto fail;
+            }
+        }
         if (array_assign_boolean_subscript(self,
                                            (PyArrayObject *)indices[0].object,
                                            tmp_arr, NPY_CORDER) < 0) {
