Backport minor fixes from trunk to 4.x

Cito · Cito · commit e645c4dfc68f · 2016-02-01T05:56:27.000Z
Fixed one reference counting issue with setting the notice receiver,
also support unmounting the notice receiver callback.
Replaced some overly complicated or unofficial ways of calling 
Python functions with cleaner code.
diff --git a/pgmodule.c b/pgmodule.c
@@ -1787,10 +1787,11 @@ void notice_receiver(void *arg, const PGresult *res)
 	PyGILState_STATE gstate = PyGILState_Ensure();
 	pgobject *self = (pgobject*) arg;
 	PyObject *proc = self->notice_receiver;
+
 	if (proc && PyCallable_Check(proc))
 	{
 		pgnoticeobject *notice = PyObject_NEW(pgnoticeobject, &PgNoticeType);
-		PyObject *args, *ret;
+		PyObject *ret;
 		if (notice)
 		{
 			notice->pgcnx = arg;
@@ -1801,10 +1802,8 @@ void notice_receiver(void *arg, const PGresult *res)
 			Py_INCREF(Py_None);
 			notice = (pgnoticeobject *)(void *)Py_None;
 		}
-		args = Py_BuildValue("(O)", notice);
-		ret = PyObject_CallObject(proc, args);
+		ret = PyObject_CallFunction(proc, "(O)", notice);
 		Py_XDECREF(ret);
-		Py_DECREF(args);
 	}
 	PyGILState_Release(gstate);
 }
@@ -1963,9 +1962,15 @@ pg_set_notice_receiver(pgobject * self, PyObject * args)
 
 	if (PyArg_ParseTuple(args, "O", &proc))
 	{
-		if (PyCallable_Check(proc))
+		if (proc == Py_None)
+		{
+			Py_XDECREF(self->notice_receiver);
+			self->notice_receiver = NULL;
+			Py_INCREF(Py_None); ret = Py_None;
+		}
+		else if (PyCallable_Check(proc))
 		{
-			Py_XINCREF(proc);
+			Py_XINCREF(proc); Py_XDECREF(self->notice_receiver);
 			self->notice_receiver = proc;
 			PQsetNoticeReceiver(self->cnx, notice_receiver, self);
 			Py_INCREF(Py_None); ret = Py_None;
@@ -2202,15 +2207,14 @@ pgquery_getresult(pgqueryobject *self, PyObject *args)
 					case PYGRES_DECIMAL:
 						if (decimal)
 						{
-							tmp_obj = Py_BuildValue("(s)", s);
-							val = PyEval_CallObject(decimal, tmp_obj);
+							val = PyObject_CallFunction(decimal, "(s)", s);
 						}
 						else
 						{
 							tmp_obj = PyString_FromString(s);
 							val = PyFloat_FromString(tmp_obj, NULL);
+							Py_DECREF(tmp_obj);
 						}
-						Py_DECREF(tmp_obj);
 						break;
 
 					case PYGRES_BOOL:
@@ -2343,15 +2347,14 @@ pgquery_dictresult(pgqueryobject *self, PyObject *args)
 					case PYGRES_DECIMAL:
 						if (decimal)
 						{
-							tmp_obj = Py_BuildValue("(s)", s);
-							val = PyEval_CallObject(decimal, tmp_obj);
+							val = PyObject_CallFunction(decimal, "(s)", s);
 						}
 						else
 						{
 							tmp_obj = PyString_FromString(s);
 							val = PyFloat_FromString(tmp_obj, NULL);
+							Py_DECREF(tmp_obj);
 						}
-						Py_DECREF(tmp_obj);
 						break;
 
 					case PYGRES_BOOL:
@@ -2401,8 +2404,7 @@ static char pgquery_namedresult__doc__[] =
 static PyObject *
 pgquery_namedresult(pgqueryobject *self, PyObject *args)
 {
-	PyObject   *arglist,
-			   *ret;
+	PyObject   *ret;
 
 	/* checks args (args == NULL for an internal call) */
 	if (args && !PyArg_ParseTuple(args, ""))
@@ -2419,9 +2421,7 @@ pgquery_namedresult(pgqueryobject *self, PyObject *args)
 		return NULL;
 	}
 
-	arglist = Py_BuildValue("(O)", self);
-	ret = PyObject_CallObject(namedresult, arglist);
-	Py_DECREF(arglist);
+	ret = PyObject_CallFunction(namedresult, "(O)", self);
 
 	if (ret == NULL)
 	    return NULL;
diff --git a/tests/test_classic_connection.py b/tests/test_classic_connection.py
@@ -903,14 +903,17 @@ def testGetNoticeReceiver(self):
         self.assertIsNone(self.c.get_notice_receiver())
 
     def testSetNoticeReceiver(self):
-        self.assertRaises(TypeError, self.c.set_notice_receiver, None)
         self.assertRaises(TypeError, self.c.set_notice_receiver, 42)
+        self.assertRaises(TypeError, self.c.set_notice_receiver, 'invalid')
         self.assertIsNone(self.c.set_notice_receiver(lambda notice: None))
+        self.assertIsNone(self.c.set_notice_receiver(None))
 
     def testSetAndGetNoticeReceiver(self):
         r = lambda notice: None
         self.assertIsNone(self.c.set_notice_receiver(r))
         self.assertIs(self.c.get_notice_receiver(), r)
+        self.assertIsNone(self.c.set_notice_receiver(None))
+        self.assertIsNone(self.c.get_notice_receiver())
 
     def testNoticeReceiver(self):
         self.c.query('''create function bilbo_notice() returns void AS $$

Original file line number	Diff line number	Diff line change
`@@ -1787,10 +1787,11 @@ void notice_receiver(void arg, const PGresult res)`
`1787`	`1787`	`PyGILState_STATE gstate = PyGILState_Ensure();`
`1788`	`1788`	`pgobject self = (pgobject) arg;`
`1789`	`1789`	`PyObject *proc = self->notice_receiver;`
	`1790`	`+`
`1790`	`1791`	`if (proc && PyCallable_Check(proc))`
`1791`	`1792`	`{`
`1792`	`1793`	`pgnoticeobject *notice = PyObject_NEW(pgnoticeobject, &PgNoticeType);`
`1793`		`- PyObject args, ret;`
	`1794`	`+ PyObject *ret;`
`1794`	`1795`	`if (notice)`
`1795`	`1796`	`{`
`1796`	`1797`	`notice->pgcnx = arg;`
`@@ -1801,10 +1802,8 @@ void notice_receiver(void arg, const PGresult res)`
`1801`	`1802`	`Py_INCREF(Py_None);`
`1802`	`1803`	`notice = (pgnoticeobject )(void )Py_None;`
`1803`	`1804`	`}`
`1804`		`- args = Py_BuildValue("(O)", notice);`
`1805`		`- ret = PyObject_CallObject(proc, args);`
	`1805`	`+ ret = PyObject_CallFunction(proc, "(O)", notice);`
`1806`	`1806`	`Py_XDECREF(ret);`
`1807`		`- Py_DECREF(args);`
`1808`	`1807`	`}`
`1809`	`1808`	`PyGILState_Release(gstate);`
`1810`	`1809`	`}`
`@@ -1963,9 +1962,15 @@ pg_set_notice_receiver(pgobject * self, PyObject * args)`
`1963`	`1962`
`1964`	`1963`	`if (PyArg_ParseTuple(args, "O", &proc))`
`1965`	`1964`	`{`
`1966`		`- if (PyCallable_Check(proc))`
	`1965`	`+ if (proc == Py_None)`
	`1966`	`+ {`
	`1967`	`+ Py_XDECREF(self->notice_receiver);`
	`1968`	`+ self->notice_receiver = NULL;`
	`1969`	`+ Py_INCREF(Py_None); ret = Py_None;`
	`1970`	`+ }`
	`1971`	`+ else if (PyCallable_Check(proc))`
`1967`	`1972`	`{`
`1968`		`- Py_XINCREF(proc);`
	`1973`	`+ Py_XINCREF(proc); Py_XDECREF(self->notice_receiver);`
`1969`	`1974`	`self->notice_receiver = proc;`
`1970`	`1975`	`PQsetNoticeReceiver(self->cnx, notice_receiver, self);`
`1971`	`1976`	`Py_INCREF(Py_None); ret = Py_None;`
`@@ -2202,15 +2207,14 @@ pgquery_getresult(pgqueryobject self, PyObject args)`
`2202`	`2207`	`case PYGRES_DECIMAL:`
`2203`	`2208`	`if (decimal)`
`2204`	`2209`	`{`
`2205`		`- tmp_obj = Py_BuildValue("(s)", s);`
`2206`		`- val = PyEval_CallObject(decimal, tmp_obj);`
	`2210`	`+ val = PyObject_CallFunction(decimal, "(s)", s);`
`2207`	`2211`	`}`
`2208`	`2212`	`else`
`2209`	`2213`	`{`
`2210`	`2214`	`tmp_obj = PyString_FromString(s);`
`2211`	`2215`	`val = PyFloat_FromString(tmp_obj, NULL);`
	`2216`	`+ Py_DECREF(tmp_obj);`
`2212`	`2217`	`}`
`2213`		`- Py_DECREF(tmp_obj);`
`2214`	`2218`	`break;`
`2215`	`2219`
`2216`	`2220`	`case PYGRES_BOOL:`
`@@ -2343,15 +2347,14 @@ pgquery_dictresult(pgqueryobject self, PyObject args)`
`2343`	`2347`	`case PYGRES_DECIMAL:`
`2344`	`2348`	`if (decimal)`
`2345`	`2349`	`{`
`2346`		`- tmp_obj = Py_BuildValue("(s)", s);`
`2347`		`- val = PyEval_CallObject(decimal, tmp_obj);`
	`2350`	`+ val = PyObject_CallFunction(decimal, "(s)", s);`
`2348`	`2351`	`}`
`2349`	`2352`	`else`
`2350`	`2353`	`{`
`2351`	`2354`	`tmp_obj = PyString_FromString(s);`
`2352`	`2355`	`val = PyFloat_FromString(tmp_obj, NULL);`
	`2356`	`+ Py_DECREF(tmp_obj);`
`2353`	`2357`	`}`
`2354`		`- Py_DECREF(tmp_obj);`
`2355`	`2358`	`break;`
`2356`	`2359`
`2357`	`2360`	`case PYGRES_BOOL:`
`@@ -2401,8 +2404,7 @@ static char pgquery_namedresult__doc__[] =`
`2401`	`2404`	`static PyObject *`
`2402`	`2405`	`pgquery_namedresult(pgqueryobject self, PyObject args)`
`2403`	`2406`	`{`
`2404`		`- PyObject *arglist,`
`2405`		`- *ret;`
	`2407`	`+ PyObject *ret;`
`2406`	`2408`
`2407`	`2409`	`/* checks args (args == NULL for an internal call) */`
`2408`	`2410`	`if (args && !PyArg_ParseTuple(args, ""))`
`@@ -2419,9 +2421,7 @@ pgquery_namedresult(pgqueryobject self, PyObject args)`
`2419`	`2421`	`return NULL;`
`2420`	`2422`	`}`
`2421`	`2423`
`2422`		`- arglist = Py_BuildValue("(O)", self);`
`2423`		`- ret = PyObject_CallObject(namedresult, arglist);`
`2424`		`- Py_DECREF(arglist);`
	`2424`	`+ ret = PyObject_CallFunction(namedresult, "(O)", self);`
`2425`	`2425`
`2426`	`2426`	`if (ret == NULL)`
`2427`	`2427`	`return NULL;`