mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

bpo-37483: add _PyObject_CallOneArg() function (#14558)

Browse source
This commit is contained in:
Jeroen Demeyer 2019-07-04 12:31:34 +02:00 • committed by Inada Naoki
parent 9d40554e0d
commit 196a530e00
44 changed files with 128 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/cjkcodecs/cjkcodecs.h
View file

@ -291,7 +291,7 @@ getcodec(PyObject *self, PyObject *encoding)
if (codecobj == NULL)
return NULL;
r = PyObject_CallFunctionObjArgs(cofunc, codecobj, NULL);
r = _PyObject_CallOneArg(cofunc, codecobj);
Py_DECREF(codecobj);
return r;

14
Modules/cjkcodecs/multibytecodec.c
View file

@ -81,7 +81,7 @@ internal_error_callback(const char *errors)
static PyObject *
call_error_callback(PyObject *errors, PyObject *exc)
{
PyObject *args, *cb, *r;
PyObject *cb, *r;
const char *str;
assert(PyUnicode_Check(errors));
@ -92,17 +92,7 @@ call_error_callback(PyObject *errors, PyObject *exc)
if (cb == NULL)
return NULL;
args = PyTuple_New(1);
if (args == NULL) {
Py_DECREF(cb);
return NULL;
}
PyTuple_SET_ITEM(args, 0, exc);
Py_INCREF(exc);
r = PyObject_CallObject(cb, args);
Py_DECREF(args);
r = _PyObject_CallOneArg(cb, exc);
Py_DECREF(cb);
return r;
}