mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

_asyncio uses _PyObject_CallMethodIdObjArgs()

Browse source 
Issue #28920: Replace _PyObject_CallMethodId(obj, meth, "O", arg) with
_PyObject_CallMethodIdObjArgs(obj, meth, arg, NULL) to avoid
_PyObject_CallMethodId() special case when arg is a tuple.

If arg is a tuple, _PyObject_CallMethodId() unpacks the tuple: obj.meth(*arg).
This commit is contained in:
Victor Stinner 2016-12-15 09:05:11 +01:00
parent 0bf590627b
commit cb2128cada
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Modules/_asynciomodule.c
View file

@ -1327,7 +1327,7 @@ _asyncio_Task___init___impl(TaskObj *self, PyObject *coro, PyObject *loop)
return -1; return -1;
} }
res = _PyObject_CallMethodId(all_tasks, &PyId_add, "O", self, NULL); res = _PyObject_CallMethodIdObjArgs(all_tasks, &PyId_add, self, NULL);
if (res == NULL) { if (res == NULL) {
return -1; return -1;
} }
@ -1838,8 +1838,8 @@ task_call_wakeup(TaskObj *task, PyObject *fut)
} }
else { else {
/* `task` is a subclass of Task */ /* `task` is a subclass of Task */
return _PyObject_CallMethodId( return _PyObject_CallMethodIdObjArgs((PyObject*)task, &PyId__wakeup,
(PyObject*)task, &PyId__wakeup, "O", fut, NULL); fut, NULL);
} }
} }
@ -1854,8 +1854,8 @@ task_call_step(TaskObj *task, PyObject *arg)
if (arg == NULL) { if (arg == NULL) {
arg = Py_None; arg = Py_None;
} }
return _PyObject_CallMethodId( return _PyObject_CallMethodIdObjArgs((PyObject*)task, &PyId__step,
(PyObject*)task, &PyId__step, "O", arg, NULL); arg, NULL);
} }
} }
@ -1869,8 +1869,8 @@ task_call_step_soon(TaskObj *task, PyObject *arg)
return -1; return -1;
} }
handle = _PyObject_CallMethodId( handle = _PyObject_CallMethodIdObjArgs(task->task_loop, &PyId_call_soon,
task->task_loop, &PyId_call_soon, "O", cb, NULL); cb, NULL);
Py_DECREF(cb); Py_DECREF(cb);
if (handle == NULL) { if (handle == NULL) {
return -1; return -1;
@ -2135,8 +2135,9 @@ task_step_impl(TaskObj *task, PyObject *exc)
if (wrapper == NULL) { if (wrapper == NULL) {
goto fail; goto fail;
} }
res = _PyObject_CallMethodId( res = _PyObject_CallMethodIdObjArgs(result,
result, &PyId_add_done_callback, "O", wrapper, NULL); &PyId_add_done_callback,
wrapper, NULL);
Py_DECREF(wrapper); Py_DECREF(wrapper);
if (res == NULL) { if (res == NULL) {
goto fail; goto fail;