From 070c4d7ca74f00336c1a959e6fabb4700643d70d Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 9 Dec 2016 12:29:18 +0100 Subject: [PATCH] Issue #28915: Use _PyObject_CallNoArg() Replace PyObject_CallFunction(func, NULL) with _PyObject_CallNoArg(func). --- Modules/_ctypes/callbacks.c | 2 +- Modules/_sqlite/connection.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c index 2c57d6b6393..a11ae047638 100644 --- 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 index 4cd3cb3e050..7bbc15c0214 100644 --- 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) {