Use Py_RETURN_NONE where suitable

petere · petere · commit 0008a106d4f8 · 2017-09-29T16:51:39.000-04:00
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
@@ -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
@@ -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
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -509,6 +509,5 @@ PLy_cursor_close(PyObject self, PyObject unused)`
`509`	`509`	`cursor->closed = true;`
`510`	`510`	`}`
`511`	`511`
`512`		`- Py_INCREF(Py_None);`
`513`		`- return Py_None;`
	`512`	`+ Py_RETURN_NONE;`
`514`	`513`	`}`
Original file line number	Diff line number	Diff line change
`@@ -575,6 +575,5 @@ PLy_output(volatile int level, PyObject self, PyObject args, PyObject *kw)`
`575`	`575`	`/*`
`576`	`576`	`* return a legal object so the interpreter will continue on its merry way`
`577`	`577`	`*/`
`578`		`- Py_INCREF(Py_None);`
`579`		`- return Py_None;`
	`578`	`+ Py_RETURN_NONE;`
`580`	`579`	`}`
Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,5 @@ PLy_subtransaction_exit(PyObject self, PyObject args)`
`212`	`212`	`CurrentResourceOwner = subxactdata->oldowner;`
`213`	`213`	`pfree(subxactdata);`
`214`	`214`
`215`		`- Py_INCREF(Py_None);`
`216`		`- return Py_None;`
	`215`	`+ Py_RETURN_NONE;`
`217`	`216`	`}`