Issue python#28915: Use _PyObject_CallNoArg()

vstinner · vstinner · commit 070c4d7ca74f · 2016-12-09T12:29:18.000+01:00
Replace PyObject_CallFunction(func, NULL) with _PyObject_CallNoArg(func).
diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
@@ -535,7 +535,7 @@ long Call_CanUnloadNow(void)
         return E_FAIL;
     }
 
-    result = PyObject_CallFunction(func, NULL);
+    result = _PyObject_CallNoArg(func);
     Py_DECREF(func);
     if (!result) {
         PyErr_WriteUnraisable(context ? context : Py_None);
diff --git a/Modules/_sqlite/connection.c b/Modules/_sqlite/connection.c
@@ -645,7 +645,7 @@ static void _pysqlite_step_callback(sqlite3_context *context, int argc, sqlite3_
     aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*));
 
     if (*aggregate_instance == 0) {
-        *aggregate_instance = PyObject_CallFunction(aggregate_class, NULL);
+        *aggregate_instance = _PyObject_CallNoArg(aggregate_class);
 
         if (PyErr_Occurred()) {
             *aggregate_instance = 0;
@@ -933,7 +933,7 @@ static int _progress_handler(void* user_arg)
 
     gilstate = PyGILState_Ensure();
 #endif
-    ret = PyObject_CallFunction((PyObject*)user_arg, NULL);
+    ret = _PyObject_CallNoArg((PyObject*)user_arg);
 
     if (!ret) {
         if (_enable_callback_tracebacks) {

Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ long Call_CanUnloadNow(void)`
`535`	`535`	`return E_FAIL;`
`536`	`536`	`}`
`537`	`537`
`538`		`- result = PyObject_CallFunction(func, NULL);`
	`538`	`+ result = _PyObject_CallNoArg(func);`
`539`	`539`	`Py_DECREF(func);`
`540`	`540`	`if (!result) {`
`541`	`541`	`PyErr_WriteUnraisable(context ? context : Py_None);`