Merge pull request #8304 from charris/backport-8302

charris · web-flow · commit da6bdf4d3a9e · 2016-11-23T15:30:30.000-05:00
BUG: Fix PyPy crash in PyUFunc_GenericReduction.
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c
@@ -3906,7 +3906,6 @@ PyUFunc_GenericReduction(PyUFuncObject *ufunc, PyObject *args,
         }
         /* Until removed outright by https://github.com/numpy/numpy/pull/8187 */
         if (bad_keepdimarg != NULL) {
-            Py_DECREF(bad_keepdimarg);
             if (DEPRECATE_FUTUREWARNING(
                     "keepdims argument has no effect on accumulate, and will be "
                     "removed in future") < 0) {

Original file line number	Diff line number	Diff line change
`@@ -3906,7 +3906,6 @@ PyUFunc_GenericReduction(PyUFuncObject ufunc, PyObject args,`
`3906`	`3906`	`}`
`3907`	`3907`	`/* Until removed outright by https://github.com/numpy/numpy/pull/8187 */`
`3908`	`3908`	`if (bad_keepdimarg != NULL) {`
`3909`		`- Py_DECREF(bad_keepdimarg);`
`3910`	`3909`	`if (DEPRECATE_FUTUREWARNING(`
`3911`	`3910`	`"keepdims argument has no effect on accumulate, and will be "`
`3912`	`3911`	`"removed in future") < 0) {`