Merge pull request #14144 from eric-wieser/fix-14142-spinoff

charris · web-flow · commit ca947be48c98 · 2019-07-28T17:57:11.000-05:00
BUG: Remove stray print that causes a SystemError on python 3.7 due to an exception being in flight
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c
@@ -497,9 +497,6 @@ _convert_from_array_descr(PyObject *obj, int align)
             else {
                 ret = PyArray_DescrConverter(PyTuple_GET_ITEM(item, 1), &conv);
             }
-            if (ret == NPY_FAIL) {
-                PyObject_Print(PyTuple_GET_ITEM(item, 1), stderr, 0);
-            }
         }
         else if (PyTuple_GET_SIZE(item) == 3) {
             newobj = PyTuple_GetSlice(item, 1, 3);
@@ -517,6 +514,7 @@ _convert_from_array_descr(PyObject *obj, int align)
         if (ret == NPY_FAIL) {
             goto fail;
         }
+
         if ((PyDict_GetItem(fields, name) != NULL)
              || (title
                  && PyBaseString_Check(title)

Original file line number	Diff line number	Diff line change
`@@ -497,9 +497,6 @@ _convert_from_array_descr(PyObject *obj, int align)`
`497`	`497`	`else {`
`498`	`498`	`ret = PyArray_DescrConverter(PyTuple_GET_ITEM(item, 1), &conv);`
`499`	`499`	`}`
`500`		`- if (ret == NPY_FAIL) {`
`501`		`- PyObject_Print(PyTuple_GET_ITEM(item, 1), stderr, 0);`
`502`		`- }`
`503`	`500`	`}`
`504`	`501`	`else if (PyTuple_GET_SIZE(item) == 3) {`
`505`	`502`	`newobj = PyTuple_GetSlice(item, 1, 3);`
`@@ -517,6 +514,7 @@ _convert_from_array_descr(PyObject *obj, int align)`
`517`	`514`	`if (ret == NPY_FAIL) {`
`518`	`515`	`goto fail;`
`519`	`516`	`}`
	`517`	`+`
`520`	`518`	`if ((PyDict_GetItem(fields, name) != NULL)`
`521`	`519`	`\|\| (title`
`522`	`520`	`&& PyBaseString_Check(title)`