diff options
author | mattip <matti.picus@gmail.com> | 2018-12-14 10:54:53 +0200 |
---|---|---|
committer | mattip <matti.picus@gmail.com> | 2018-12-14 10:54:53 +0200 |
commit | 6379f3eb7c8829100d3f73b26d58ec4f834980fe (patch) | |
tree | 77ff1460616eba8af9681725792f2a6544aab26e | |
parent | 33b72d2a3be10a21f8d8a00fe6dd04102857c688 (diff) | |
download | numpy-6379f3eb7c8829100d3f73b26d58ec4f834980fe.tar.gz |
MAINT: return Py_None not NULL
-rw-r--r-- | numpy/core/src/common/ufunc_override.c | 5 | ||||
-rw-r--r-- | numpy/core/src/multiarray/methods.c | 2 | ||||
-rw-r--r-- | numpy/core/src/umath/override.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/numpy/core/src/common/ufunc_override.c b/numpy/core/src/common/ufunc_override.c index e9089bc6c..079f79065 100644 --- a/numpy/core/src/common/ufunc_override.c +++ b/numpy/core/src/common/ufunc_override.c @@ -79,7 +79,8 @@ NPY_NO_EXPORT int PyUFuncOverride_GetOutObjects(PyObject *kwds, PyObject **out_kwd_obj, PyObject ***out_objs) { if (kwds == NULL) { - *out_kwd_obj = NULL; + Py_INCREF(Py_None); + *out_kwd_obj = Py_None; return 0; } if (!PyDict_CheckExact(kwds)) { @@ -92,6 +93,8 @@ PyUFuncOverride_GetOutObjects(PyObject *kwds, PyObject **out_kwd_obj, PyObject * /* borrowed reference */ *out_kwd_obj = PyDict_GetItemString(kwds, "out"); if (*out_kwd_obj == NULL) { + Py_INCREF(Py_None); + *out_kwd_obj = Py_None; return 0; } if (PyTuple_CheckExact(*out_kwd_obj)) { diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c index 271207011..7c814e6e6 100644 --- a/numpy/core/src/multiarray/methods.c +++ b/numpy/core/src/multiarray/methods.c @@ -1034,7 +1034,7 @@ any_array_ufunc_overrides(PyObject *args, PyObject *kwds) return 1; } } - Py_XDECREF(out_kwd_obj); + Py_DECREF(out_kwd_obj); return 0; } diff --git a/numpy/core/src/umath/override.c b/numpy/core/src/umath/override.c index b87af4cb7..2ea23311b 100644 --- a/numpy/core/src/umath/override.c +++ b/numpy/core/src/umath/override.c @@ -86,7 +86,7 @@ get_array_ufunc_overrides(PyObject *args, PyObject *kwds, ++num_override_args; } } - Py_XDECREF(out_kwd_obj); + Py_DECREF(out_kwd_obj); return num_override_args; fail: @@ -94,7 +94,7 @@ fail: Py_DECREF(with_override[i]); Py_DECREF(methods[i]); } - Py_XDECREF(out_kwd_obj); + Py_DECREF(out_kwd_obj); return -1; } |