Use Py_RETURN_NONE where suitable

This is more idiomatic style and available as of Python 2.4, which is
our minimum.

diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c
index 2ad663cf6618c106b6dfb8f1778e450f2b1d0474..0108471bfe218ccfd46d42208ef07a95a546339d 100644 (file)
--- a/src/pl/plpython/plpy_cursorobject.c
+++ b/src/pl/plpython/plpy_cursorobject.c
@@ -509,6 +509,5 @@ PLy_cursor_close(PyObject *self, PyObject *unused)
                cursor->closed = true;
        }
 
-       Py_INCREF(Py_None);
-       return Py_None;
+       Py_RETURN_NONE;
 }

diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
index feaf2032560863cfa8c69d7980e9bd16026ef406..759ad449323caeb0c866c03967fda33c6dbdc722 100644 (file)
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@ -575,6 +575,5 @@ PLy_output(volatile int level, PyObject *self, PyObject *args, PyObject *kw)
        /*
         * return a legal object so the interpreter will continue on its merry way
         */
-       Py_INCREF(Py_None);
-       return Py_None;
+       Py_RETURN_NONE;
 }

diff --git a/src/pl/plpython/plpy_subxactobject.c b/src/pl/plpython/plpy_subxactobject.c
index 9f1caa87d9411e6f56cbc3f5a48a4b105346f4fd..331d2b859c0eedb92e4a594aac909cd0ab48bc70 100644 (file)
--- a/src/pl/plpython/plpy_subxactobject.c
+++ b/src/pl/plpython/plpy_subxactobject.c
@@ -212,6 +212,5 @@ PLy_subtransaction_exit(PyObject *self, PyObject *args)
        CurrentResourceOwner = subxactdata->oldowner;
        pfree(subxactdata);
 
-       Py_INCREF(Py_None);
-       return Py_None;
+       Py_RETURN_NONE;
 }