Merge pull request #5797 from jaimefrio/py_return_none

MANT: Use Py_RETURN_NONE whenever Py_None is returned

17 files changed, 51 insertions, 101 deletions

diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
index 8287c2268..fb467cb78 100644
--- a/numpy/core/src/multiarray/arraytypes.c.src
+++ b/numpy/core/src/multiarray/arraytypes.c.src
@@ -529,8 +529,7 @@ OBJECT_getitem(char *ip, PyArrayObject *ap)
     PyObject *obj;
     NPY_COPY_PYOBJECT_PTR(&obj, ip);
     if (obj == NULL) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
     else {
         Py_INCREF(obj);
diff --git a/numpy/core/src/multiarray/compiled_base.c b/numpy/core/src/multiarray/compiled_base.c
index baf405d1e..76c5e9c25 100644
--- a/numpy/core/src/multiarray/compiled_base.c
+++ b/numpy/core/src/multiarray/compiled_base.c
@@ -440,8 +440,7 @@ arr_insert(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict)
         Py_DECREF(avals);
         PyDataMem_FREE(zero);
         Py_DECREF(ainput);
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
 
     totmask = (int) PyArray_SIZE(amask);
@@ -466,8 +465,7 @@ arr_insert(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict)
     Py_DECREF(avals);
     PyDataMem_FREE(zero);
     Py_DECREF(ainput);
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 
 fail:
     PyDataMem_FREE(zero);
@@ -1233,8 +1231,7 @@ arr_add_docstring(PyObject *NPY_UNUSED(dummy), PyObject *args)
 
     /* Don't add docstrings */
     if (Py_OptimizeFlag > 1) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
 
     if (PyGetSetDescr_TypePtr == NULL) {
@@ -1315,8 +1312,7 @@ arr_add_docstring(PyObject *NPY_UNUSED(dummy), PyObject *args)
                             "Cannot set a docstring for that object");
             return NULL;
         }
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
 
 #undef _TESTDOC1
@@ -1324,8 +1320,7 @@ arr_add_docstring(PyObject *NPY_UNUSED(dummy), PyObject *args)
 #undef _ADDDOC
 
     Py_INCREF(str);
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 
diff --git a/numpy/core/src/multiarray/datetime.c b/numpy/core/src/multiarray/datetime.c
index a870650fc..9e4e00e9c 100644
--- a/numpy/core/src/multiarray/datetime.c
+++ b/numpy/core/src/multiarray/datetime.c
@@ -2808,8 +2808,7 @@ convert_datetime_to_pyobject(npy_datetime dt, PyArray_DatetimeMetaData *meta)
      * into None.
      */
     if (dt == NPY_DATETIME_NAT || meta->base == NPY_FR_GENERIC) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
 
     /* If the type's precision is greater than microseconds, return an int */
@@ -2862,8 +2861,7 @@ convert_timedelta_to_pyobject(npy_timedelta td, PyArray_DatetimeMetaData *meta)
      * Convert NaT (not-a-time) into None.
      */
     if (td == NPY_DATETIME_NAT) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
 
     /*
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c
index bbcd5da36..a7953b44d 100644
--- a/numpy/core/src/multiarray/descriptor.c
+++ b/numpy/core/src/multiarray/descriptor.c
@@ -143,8 +143,7 @@ array_set_typeDict(PyObject *NPY_UNUSED(ignored), PyObject *args)
     typeDict = dict;
     /* Create an internal reference to it */
     Py_INCREF(dict);
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 #define _chk_byteorder(arg) (arg == '>' || arg == '<' ||        \
@@ -1655,8 +1654,7 @@ static PyObject *
 arraydescr_subdescr_get(PyArray_Descr *self)
 {
     if (!PyDataType_HASSUBARRAY(self)) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
     return Py_BuildValue("OO",
             (PyObject *)self->subarray->base, self->subarray->shape);
@@ -1905,8 +1903,7 @@ static PyObject *
 arraydescr_fields_get(PyArray_Descr *self)
 {
     if (!PyDataType_HASFIELDS(self)) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
     return PyDictProxy_New(self->fields);
 }
@@ -1915,8 +1912,7 @@ static PyObject *
 arraydescr_metadata_get(PyArray_Descr *self)
 {
     if (self->metadata == NULL) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
     return PyDictProxy_New(self->metadata);
 }
@@ -1936,8 +1932,7 @@ static PyObject *
 arraydescr_names_get(PyArray_Descr *self)
 {
     if (!PyDataType_HASFIELDS(self)) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
     Py_INCREF(self->names);
     return self->names;
@@ -2380,8 +2375,7 @@ arraydescr_setstate(PyArray_Descr *self, PyObject *args)
     char dtypeflags;
 
     if (self->fields == Py_None) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
     if (PyTuple_GET_SIZE(args) != 1
             || !(PyTuple_Check(PyTuple_GET_ITEM(args, 0)))) {
@@ -2725,8 +2719,7 @@ arraydescr_setstate(PyArray_Descr *self, PyObject *args)
         Py_XDECREF(old_metadata);
     }
 
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 /*NUMPY_API
diff --git a/numpy/core/src/multiarray/getset.c b/numpy/core/src/multiarray/getset.c
index 5374f42e7..cbc798273 100644
--- a/numpy/core/src/multiarray/getset.c
+++ b/numpy/core/src/multiarray/getset.c
@@ -223,8 +223,7 @@ static PyObject *
 array_protocol_strides_get(PyArrayObject *self)
 {
     if (PyArray_ISCONTIGUOUS(self)) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
     return PyArray_IntTupleFromIntp(PyArray_NDIM(self), PyArray_STRIDES(self));
 }
@@ -618,8 +617,7 @@ static PyObject *
 array_base_get(PyArrayObject *self)
 {
     if (PyArray_BASE(self) == NULL) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
     else {
         Py_INCREF(PyArray_BASE(self));
@@ -897,8 +895,7 @@ array_transpose_get(PyArrayObject *self)
 static PyObject *
 array_finalize_get(PyArrayObject *NPY_UNUSED(self))
 {
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 NPY_NO_EXPORT PyGetSetDef array_getsetlist[] = {
diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c
index 877887109..00639a19c 100644
--- a/numpy/core/src/multiarray/item_selection.c
+++ b/numpy/core/src/multiarray/item_selection.c
@@ -408,8 +408,7 @@ PyArray_PutTo(PyArrayObject *self, PyObject* values0, PyObject *indices0,
     if (copied) {
         Py_DECREF(self);
     }
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 
  fail:
     Py_XDECREF(indices);
@@ -482,8 +481,7 @@ PyArray_PutMask(PyArrayObject *self, PyObject* values0, PyObject* mask0)
     if (nv <= 0) {
         Py_XDECREF(values);
         Py_XDECREF(mask);
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
     src = PyArray_DATA(values);
 
@@ -527,8 +525,7 @@ PyArray_PutMask(PyArrayObject *self, PyObject* values0, PyObject* mask0)
     if (copied) {
         Py_DECREF(self);
     }
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 
  fail:
     Py_XDECREF(mask);
diff --git a/numpy/core/src/multiarray/iterators.c b/numpy/core/src/multiarray/iterators.c
index 81c6b2a8e..e56237573 100644
--- a/numpy/core/src/multiarray/iterators.c
+++ b/numpy/core/src/multiarray/iterators.c
@@ -1760,8 +1760,7 @@ arraymultiter_reset(PyArrayMultiIterObject *self, PyObject *args)
         return NULL;
     }
     PyArray_MultiIter_RESET(self);
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyMethodDef arraymultiter_methods[] = {
diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
index 851a37456..a51453dd1 100644
--- a/numpy/core/src/multiarray/methods.c
+++ b/numpy/core/src/multiarray/methods.c
@@ -149,8 +149,7 @@ array_fill(PyArrayObject *self, PyObject *args)
     if (PyArray_FillWithScalar(self, obj) < 0) {
         return NULL;
     }
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -466,8 +465,7 @@ array_setfield(PyArrayObject *self, PyObject *args, PyObject *kwds)
     if (PyArray_SetField(self, dtype, offset, value) < 0) {
         return NULL;
     }
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 /* This doesn't change the descriptor just the actual data...
@@ -605,8 +603,7 @@ array_tofile(PyArrayObject *self, PyObject *args, PyObject *kwds)
         goto fail;
     }
     Py_DECREF(file);
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 
 fail:
     Py_DECREF(file);
@@ -757,8 +754,7 @@ array_setscalar(PyArrayObject *self, PyObject *args)
         return NULL;
     }
     else {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
 }
 
@@ -1055,14 +1051,12 @@ array_resize(PyArrayObject *self, PyObject *args, PyObject *kwds)
     }
 
     if (size == 0) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
     else if (size == 1) {
         obj = PyTuple_GET_ITEM(args, 0);
         if (obj == Py_None) {
-            Py_INCREF(Py_None);
-            return Py_None;
+            Py_RETURN_NONE;
         }
         args = obj;
     }
@@ -1079,8 +1073,7 @@ array_resize(PyArrayObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
     Py_DECREF(ret);
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -1177,8 +1170,7 @@ array_sort(PyArrayObject *self, PyObject *args, PyObject *kwds)
     if (val < 0) {
         return NULL;
     }
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -1246,8 +1238,7 @@ array_partition(PyArrayObject *self, PyObject *args, PyObject *kwds)
     if (val < 0) {
         return NULL;
     }
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -1806,8 +1797,7 @@ array_setstate(PyArrayObject *self, PyObject *args)
 
     PyArray_UpdateFlags(self, NPY_ARRAY_UPDATE_ALL);
 
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 /*NUMPY_API*/
@@ -1884,8 +1874,7 @@ array_dump(PyArrayObject *self, PyObject *args)
     if (ret < 0) {
         return NULL;
     }
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 
@@ -2305,8 +2294,7 @@ array_setflags(PyArrayObject *self, PyObject *args, PyObject *kwds)
         }
     }
 
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 
diff --git a/numpy/core/src/multiarray/multiarray_tests.c.src b/numpy/core/src/multiarray/multiarray_tests.c.src
index 9a2cd0c1b..e7f8e36fd 100644
--- a/numpy/core/src/multiarray/multiarray_tests.c.src
+++ b/numpy/core/src/multiarray/multiarray_tests.c.src
@@ -412,8 +412,7 @@ test_pydatamem_seteventhook_start(PyObject* NPY_UNUSED(self), PyObject* NPY_UNUS
 {
     malloc_free_counts[0] = malloc_free_counts[1] = 0;
     old_hook = PyDataMem_SetEventHook(test_hook, (void *) malloc_free_counts, &old_data);
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyObject*
@@ -440,8 +439,7 @@ test_pydatamem_seteventhook_end(PyObject* NPY_UNUSED(self), PyObject* NPY_UNUSED
         return NULL;
     }
 
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 
@@ -563,8 +561,7 @@ inplace_increment(PyObject *dummy, PyObject *args)
 
     Py_DECREF(mit);
 
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 
 fail:
     Py_XDECREF(mit);
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index 1a8fda94d..369b5a8e1 100644
--- a/numpy/core/src/multiarray/multiarraymodule.c
+++ b/numpy/core/src/multiarray/multiarraymodule.c
@@ -1842,8 +1842,7 @@ array_copyto(PyObject *NPY_UNUSED(ignored), PyObject *args, PyObject *kwds)
     Py_XDECREF(src);
     Py_XDECREF(wheremask);
 
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 
  fail:
     Py_XDECREF(src);
@@ -2892,8 +2891,7 @@ array_set_string_function(PyObject *NPY_UNUSED(self), PyObject *args,
         return NULL;
     }
     PyArray_SetStringFunction(op, repr);
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyObject *
diff --git a/numpy/core/src/multiarray/numpymemoryview.c b/numpy/core/src/multiarray/numpymemoryview.c
index ccc5f33ed..3f5616601 100644
--- a/numpy/core/src/multiarray/numpymemoryview.c
+++ b/numpy/core/src/multiarray/numpymemoryview.c
@@ -112,8 +112,7 @@ _IntTupleFromSsizet(int len, Py_ssize_t *vals)
     PyObject *intTuple;
 
     if (vals == NULL) {
-        Py_INCREF(Py_None);
-        return Py_None;
+        Py_RETURN_NONE;
     }
     intTuple = PyTuple_New(len);
     if (!intTuple) return NULL;
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
index 252e5b726..b91a644cd 100644
--- a/numpy/core/src/multiarray/scalartypes.c.src
+++ b/numpy/core/src/multiarray/scalartypes.c.src
@@ -1308,8 +1308,7 @@ gentype_typedescr_get(PyObject *self)
 static PyObject *
 gentype_base_get(PyObject *NPY_UNUSED(self))
 {
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 
@@ -1741,8 +1740,7 @@ voidtype_setfield(PyVoidScalarObject *self, PyObject *args, PyObject *kwds)
                 src);
         Py_DECREF(src);
     }
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 
@@ -1836,8 +1834,7 @@ fail:
 static PyObject *
 gentype_setstate(PyObject *NPY_UNUSED(self), PyObject *NPY_UNUSED(args))
 {
-    Py_INCREF(Py_None);
-    return (Py_None);
+    Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -1853,8 +1850,7 @@ gentype_dump(PyObject *self, PyObject *args)
     if (ret < 0) {
         return NULL;
     }
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 static PyObject *
@@ -1872,8 +1868,7 @@ static PyObject *
 gentype_setflags(PyObject *NPY_UNUSED(self), PyObject *NPY_UNUSED(args),
         PyObject *NPY_UNUSED(kwds))
 {
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 /*
@@ -2575,7 +2570,7 @@ static PyObject *
     PyArrayObject *arr;
     PyArray_Descr *typecode = NULL;
 #if (@work@ != 0) || (@default@ == 1)
-    void *thisfunc = (void *)@name@_arrtype_new; 
+    void *thisfunc = (void *)@name@_arrtype_new;
 #endif
 #if !(@default@ == 2)
     int itemsize;
diff --git a/numpy/core/src/multiarray/shape.c b/numpy/core/src/multiarray/shape.c
index 03bfc6a7a..b679d6d5d 100644
--- a/numpy/core/src/multiarray/shape.c
+++ b/numpy/core/src/multiarray/shape.c
@@ -154,8 +154,7 @@ PyArray_Resize(PyArrayObject *self, PyArray_Dims *newshape, int refcheck,
             PyArray_FLAGS(self), &(((PyArrayObject_fields *)self)->flags));
     memmove(PyArray_DIMS(self), new_dimensions, new_nd*sizeof(npy_intp));
     memmove(PyArray_STRIDES(self), new_strides, new_nd*sizeof(npy_intp));
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 /*
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c
index 9f89d71c2..21e1013d9 100644
--- a/numpy/core/src/umath/ufunc_object.c
+++ b/numpy/core/src/umath/ufunc_object.c
@@ -4401,8 +4401,7 @@ ufunc_seterr(PyObject *NPY_UNUSED(dummy), PyObject *args)
         return NULL;
     }
 #endif
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 
diff --git a/numpy/core/src/umath/umathmodule.c b/numpy/core/src/umath/umathmodule.c
index 624588410..b1da2aeed 100644
--- a/numpy/core/src/umath/umathmodule.c
+++ b/numpy/core/src/umath/umathmodule.c
@@ -242,8 +242,7 @@ add_newdoc_ufunc(PyObject *NPY_UNUSED(dummy), PyObject *args)
     strcpy(newdocstr, docstr);
     ufunc->doc = newdocstr;
 
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }
 
 
diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c
index 2e182922d..9024dd5b3 100644
--- a/numpy/f2py/src/fortranobject.c
+++ b/numpy/f2py/src/fortranobject.c
@@ -279,8 +279,7 @@ fortran_getattr(PyFortranObject *fp, char *name) {
                 /* Py_INCREF(v); */
                 return v;
             } else {                                    /* array is not allocated */
-                Py_INCREF(Py_None);
-                return Py_None;
+                Py_RETURN_NONE;
             }
         }
     if (strcmp(name,"__dict__")==0) {
diff --git a/numpy/linalg/lapack_litemodule.c b/numpy/linalg/lapack_litemodule.c
index f9f515bb7..32290123b 100644
--- a/numpy/linalg/lapack_litemodule.c
+++ b/numpy/linalg/lapack_litemodule.c
@@ -297,8 +297,7 @@ lapack_lite_xerbla(PyObject *NPY_UNUSED(self), PyObject *args)
     if (PyErr_Occurred()) {
         return NULL;
     }
-    Py_INCREF(Py_None);
-    return Py_None;
+    Py_RETURN_NONE;
 }