Skip to content

Commit

Permalink
Merge pull request #5797 from jaimefrio/py_return_none
Browse files Browse the repository at this point in the history 
MANT: Use Py_RETURN_NONE whenever Py_None is returned
  • Loading branch information
@charris
charris committed Apr 25, 2015
2 parents a8b1c0c + 3cc68c9 commit 588aff4
Show file tree
Hide file tree
Showing 17 changed files with 51 additions and 101 deletions.
3 changes: 1 addition & 2 deletions numpy/core/src/multiarray/arraytypes.c.src
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
15 changes: 5 additions & 10 deletions numpy/core/src/multiarray/compiled_base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -1315,17 +1312,15 @@ 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
#undef _TESTDOC2
#undef _ADDDOC

Py_INCREF(str);
Py_INCREF(Py_None);
return Py_None;
Py_RETURN_NONE;
}


Expand Down
6 changes: 2 additions & 4 deletions numpy/core/src/multiarray/datetime.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
}

/*
Expand Down
21 changes: 7 additions & 14 deletions numpy/core/src/multiarray/descriptor.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 == '<' || \
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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;
Expand Down Expand Up @@ -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)))) {
Expand Down Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions numpy/core/src/multiarray/getset.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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[] = {
Expand Down
9 changes: 3 additions & 6 deletions numpy/core/src/multiarray/item_selection.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions numpy/core/src/multiarray/iterators.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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[] = {
Expand Down
36 changes: 12 additions & 24 deletions numpy/core/src/multiarray/methods.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down Expand Up @@ -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...
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -757,8 +754,7 @@ array_setscalar(PyArrayObject *self, PyObject *args)
return NULL;
}
else {
Py_INCREF(Py_None);
return Py_None;
Py_RETURN_NONE;
}
}

Expand Down Expand Up @@ -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;
}
Expand All @@ -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 *
Expand Down Expand Up @@ -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 *
Expand Down Expand Up @@ -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 *
Expand Down Expand Up @@ -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*/
Expand Down Expand Up @@ -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;
}


Expand Down Expand Up @@ -2305,8 +2294,7 @@ array_setflags(PyArrayObject *self, PyObject *args, PyObject *kwds)
}
}

Py_INCREF(Py_None);
return Py_None;
Py_RETURN_NONE;
}


Expand Down
9 changes: 3 additions & 6 deletions numpy/core/src/multiarray/multiarray_tests.c.src
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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*
Expand All @@ -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;
}


Expand Down Expand Up @@ -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);
Expand Down
6 changes: 2 additions & 4 deletions numpy/core/src/multiarray/multiarraymodule.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 *
Expand Down
3 changes: 1 addition & 2 deletions numpy/core/src/multiarray/numpymemoryview.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 588aff4

Please sign in to comment.