Merge pull request #5105 from juliantaylor/where-no-subtype

juliantaylor · juliantaylor · commit f8a1f66f2fe6 · 2014-09-23T23:44:46.000+02:00
BUG: don't propagate subtypes from np.where
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
@@ -2790,7 +2790,7 @@ PyArray_Where(PyObject *condition, PyObject *x, PyObject *y)
             NULL, arr, ax, ay
         };
         npy_uint32 op_flags[4] = {
-            NPY_ITER_WRITEONLY | NPY_ITER_ALLOCATE,
+            NPY_ITER_WRITEONLY | NPY_ITER_ALLOCATE | NPY_ITER_NO_SUBTYPE,
             NPY_ITER_READONLY, NPY_ITER_READONLY, NPY_ITER_READONLY
         };
         PyArray_Descr * common_dt = PyArray_ResultType(2, &op_in[0] + 2,
