BUG: reference count exposed by better testing

mhvk · charris · commit 787baadcf111 · 2018-05-31T07:54:34.000-06:00
Also for __array_ufunc__ overrides, sig and signature cannot be
passed in both.  This was incorrectly coded and slipped through
as it was not tested.
diff --git a/numpy/core/src/umath/override.c b/numpy/core/src/umath/override.c
@@ -29,7 +29,10 @@ normalize_signature_keyword(PyObject *normal_kwds)
                             "cannot specify both 'sig' and 'signature'");
             return -1;
         }
-        Py_INCREF(obj);
+        /*
+         * No INCREF or DECREF needed: got a borrowed reference above,
+         * and, unlike e.g. PyList_SetItem, PyDict_SetItem INCREF's it.
+         */
         PyDict_SetItemString(normal_kwds, "signature", obj);
         PyDict_DelItemString(normal_kwds, "sig");
     }
@@ -282,7 +285,6 @@ normalize_outer_args(PyUFuncObject *ufunc, PyObject *args,
     if (*normal_args == NULL) {
         return -1;
     }
-
     /* ufuncs accept 'sig' or 'signature' normalize to 'signature' */
     return normalize_signature_keyword(*normal_kwds);
 }
diff --git a/numpy/core/tests/test_umath.py b/numpy/core/tests/test_umath.py
@@ -1876,6 +1876,7 @@ def __array_ufunc__(self, ufunc, method, *inputs, **kwargs):
         # outer, wrong args
         assert_raises(TypeError, np.multiply.outer, a)
         assert_raises(TypeError, np.multiply.outer, a, a, a, a)
+        assert_raises(TypeError, np.multiply.outer, a, a, sig='a', signature='a')
 
         # at
         res = np.multiply.at(a, [4, 2], 'b0')

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,10 @@ normalize_signature_keyword(PyObject *normal_kwds)`
`29`	`29`	`"cannot specify both 'sig' and 'signature'");`
`30`	`30`	`return -1;`
`31`	`31`	`}`
`32`		`- Py_INCREF(obj);`
	`32`	`+ /*`
	`33`	`+ * No INCREF or DECREF needed: got a borrowed reference above,`
	`34`	`+ * and, unlike e.g. PyList_SetItem, PyDict_SetItem INCREF's it.`
	`35`	`+ */`
`33`	`36`	`PyDict_SetItemString(normal_kwds, "signature", obj);`
`34`	`37`	`PyDict_DelItemString(normal_kwds, "sig");`
`35`	`38`	`}`
`@@ -282,7 +285,6 @@ normalize_outer_args(PyUFuncObject ufunc, PyObject args,`
`282`	`285`	`if (*normal_args == NULL) {`
`283`	`286`	`return -1;`
`284`	`287`	`}`
`285`		`-`
`286`	`288`	`/* ufuncs accept 'sig' or 'signature' normalize to 'signature' */`
`287`	`289`	`return normalize_signature_keyword(*normal_kwds);`
`288`	`290`	`}`