diff options
| author | Jeroen Demeyer <J.Demeyer@UGent.be> | 2019-07-04 12:31:34 +0200 |
|---|---|---|
| committer | Inada Naoki <songofacandy@gmail.com> | 2019-07-04 19:31:34 +0900 |
| commit | 196a530e00d88a138973bf9182e013937e293f97 (patch) | |
| tree | 35443abb5aa148b459f68ae43a18cdbb0627ba76 /Modules/_ctypes | |
| parent | 9d40554e0da09a44a8547f3f3a2b9dedfeaf7928 (diff) | |
| download | cpython-git-196a530e00d88a138973bf9182e013937e293f97.tar.gz | |
bpo-37483: add _PyObject_CallOneArg() function (#14558)
Diffstat (limited to 'Modules/_ctypes')
| -rw-r--r-- | Modules/_ctypes/callproc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 6766524641..973a654bf3 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -925,7 +925,7 @@ static PyObject *GetResult(PyObject *restype, void *result, PyObject *checker) if (!checker || !retval) return retval; - v = PyObject_CallFunctionObjArgs(checker, retval, NULL); + v = _PyObject_CallOneArg(checker, retval); if (v == NULL) _PyTraceback_Add("GetResult", "_ctypes/callproc.c", __LINE__-2); Py_DECREF(retval); @@ -1118,7 +1118,7 @@ PyObject *_ctypes_callproc(PPROC pProc, if (argtypes && argtype_count > i) { PyObject *v; converter = PyTuple_GET_ITEM(argtypes, i); - v = PyObject_CallFunctionObjArgs(converter, arg, NULL); + v = _PyObject_CallOneArg(converter, arg); if (v == NULL) { _ctypes_extend_error(PyExc_ArgError, "argument %zd: ", i+1); goto cleanup; @@ -1795,7 +1795,7 @@ pointer(PyObject *self, PyObject *arg) typ = PyDict_GetItemWithError(_ctypes_ptrtype_cache, (PyObject *)Py_TYPE(arg)); if (typ) { - return PyObject_CallFunctionObjArgs(typ, arg, NULL); + return _PyObject_CallOneArg(typ, arg); } else if (PyErr_Occurred()) { return NULL; @@ -1803,7 +1803,7 @@ pointer(PyObject *self, PyObject *arg) typ = POINTER(NULL, (PyObject *)Py_TYPE(arg)); if (typ == NULL) return NULL; - result = PyObject_CallFunctionObjArgs(typ, arg, NULL); + result = _PyObject_CallOneArg(typ, arg); Py_DECREF(typ); return result; } |