diff options
author | doko <doko@ubuntu.com> | 2017-01-31 13:35:56 +0100 |
---|---|---|
committer | doko <doko@ubuntu.com> | 2017-01-31 13:35:56 +0100 |
commit | b23072b8814146d3a76eb752fd7526eb1575e7cc (patch) | |
tree | cf13a75e5570561a10bf68c2c451e9271229a3be /Modules/_ctypes/callbacks.c | |
parent | e0cb38ac4330d5e09b5e21c74c5d5e453af99a4f (diff) | |
parent | ccd19e48ec9d557231bf923c338be0e7509a51d3 (diff) | |
download | cpython-b23072b8814146d3a76eb752fd7526eb1575e7cc.tar.gz |
merge 3.6
Diffstat (limited to 'Modules/_ctypes/callbacks.c')
-rw-r--r-- | Modules/_ctypes/callbacks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c index b958f304c5..a11ae04763 100644 --- a/Modules/_ctypes/callbacks.c +++ b/Modules/_ctypes/callbacks.c @@ -181,7 +181,7 @@ static void _CallPythonObject(void *mem, */ } else if (dict) { /* Hm, shouldn't we use PyCData_AtAddress() or something like that instead? */ - CDataObject *obj = (CDataObject *)PyObject_CallFunctionObjArgs(cnv, NULL); + CDataObject *obj = (CDataObject *)_PyObject_CallNoArg(cnv); if (!obj) { PrintError("create argument %d:\n", i); Py_DECREF(cnv); @@ -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); |