_asyncio uses _PyObject_CallMethodIdObjArgs()

vstinner · vstinner · commit cb2128cada92 · 2016-12-15T09:05:11.000+01:00
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).
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
@@ -1327,7 +1327,7 @@ _asyncio_Task___init___impl(TaskObj *self, PyObject *coro, PyObject *loop)
         return -1;
     }
 
-    res = _PyObject_CallMethodId(all_tasks, &PyId_add, "O", self, NULL);
+    res = _PyObject_CallMethodIdObjArgs(all_tasks, &PyId_add, self, NULL);
     if (res == NULL) {
         return -1;
     }
@@ -1838,8 +1838,8 @@ task_call_wakeup(TaskObj *task, PyObject *fut)
     }
     else {
         /* `task` is a subclass of Task */
-        return _PyObject_CallMethodId(
-            (PyObject*)task, &PyId__wakeup, "O", fut, NULL);
+        return _PyObject_CallMethodIdObjArgs((PyObject*)task, &PyId__wakeup,
+                                             fut, NULL);
     }
 }
 
@@ -1854,8 +1854,8 @@ task_call_step(TaskObj *task, PyObject *arg)
         if (arg == NULL) {
             arg = Py_None;
         }
-        return _PyObject_CallMethodId(
-            (PyObject*)task, &PyId__step, "O", arg, NULL);
+        return _PyObject_CallMethodIdObjArgs((PyObject*)task, &PyId__step,
+                                             arg, NULL);
     }
 }
 
@@ -1869,8 +1869,8 @@ task_call_step_soon(TaskObj *task, PyObject *arg)
         return -1;
     }
 
-    handle = _PyObject_CallMethodId(
-        task->task_loop, &PyId_call_soon, "O", cb, NULL);
+    handle = _PyObject_CallMethodIdObjArgs(task->task_loop, &PyId_call_soon,
+                                           cb, NULL);
     Py_DECREF(cb);
     if (handle == NULL) {
         return -1;
@@ -2135,8 +2135,9 @@ task_step_impl(TaskObj *task, PyObject *exc)
                 if (wrapper == NULL) {
                     goto fail;
                 }
-                res = _PyObject_CallMethodId(
-                    result, &PyId_add_done_callback, "O", wrapper, NULL);
+                res = _PyObject_CallMethodIdObjArgs(result,
+                                                    &PyId_add_done_callback,
+                                                    wrapper, NULL);
                 Py_DECREF(wrapper);
                 if (res == NULL) {
                     goto fail;

Original file line number	Diff line number	Diff line change
`@@ -1327,7 +1327,7 @@ _asyncio_Task___init___impl(TaskObj self, PyObject coro, PyObject *loop)`
`1327`	`1327`	`return -1;`
`1328`	`1328`	`}`
`1329`	`1329`
`1330`		`- res = _PyObject_CallMethodId(all_tasks, &PyId_add, "O", self, NULL);`
	`1330`	`+ res = _PyObject_CallMethodIdObjArgs(all_tasks, &PyId_add, self, NULL);`
`1331`	`1331`	`if (res == NULL) {`
`1332`	`1332`	`return -1;`
`1333`	`1333`	`}`
`@@ -1838,8 +1838,8 @@ task_call_wakeup(TaskObj task, PyObject fut)`
`1838`	`1838`	`}`
`1839`	`1839`	`else {`
`1840`	`1840`	/* `task` is a subclass of Task */
`1841`		`- return _PyObject_CallMethodId(`
`1842`		`- (PyObject*)task, &PyId__wakeup, "O", fut, NULL);`
	`1841`	`+ return _PyObject_CallMethodIdObjArgs((PyObject*)task, &PyId__wakeup,`
	`1842`	`+ fut, NULL);`
`1843`	`1843`	`}`
`1844`	`1844`	`}`
`1845`	`1845`
`@@ -1854,8 +1854,8 @@ task_call_step(TaskObj task, PyObject arg)`
`1854`	`1854`	`if (arg == NULL) {`
`1855`	`1855`	`arg = Py_None;`
`1856`	`1856`	`}`
`1857`		`- return _PyObject_CallMethodId(`
`1858`		`- (PyObject*)task, &PyId__step, "O", arg, NULL);`
	`1857`	`+ return _PyObject_CallMethodIdObjArgs((PyObject*)task, &PyId__step,`
	`1858`	`+ arg, NULL);`
`1859`	`1859`	`}`
`1860`	`1860`	`}`
`1861`	`1861`
`@@ -1869,8 +1869,8 @@ task_call_step_soon(TaskObj task, PyObject arg)`
`1869`	`1869`	`return -1;`
`1870`	`1870`	`}`
`1871`	`1871`
`1872`		`- handle = _PyObject_CallMethodId(`
`1873`		`- task->task_loop, &PyId_call_soon, "O", cb, NULL);`
	`1872`	`+ handle = _PyObject_CallMethodIdObjArgs(task->task_loop, &PyId_call_soon,`
	`1873`	`+ cb, NULL);`
`1874`	`1874`	`Py_DECREF(cb);`
`1875`	`1875`	`if (handle == NULL) {`
`1876`	`1876`	`return -1;`
`@@ -2135,8 +2135,9 @@ task_step_impl(TaskObj task, PyObject exc)`
`2135`	`2135`	`if (wrapper == NULL) {`
`2136`	`2136`	`goto fail;`
`2137`	`2137`	`}`
`2138`		`- res = _PyObject_CallMethodId(`
`2139`		`- result, &PyId_add_done_callback, "O", wrapper, NULL);`
	`2138`	`+ res = _PyObject_CallMethodIdObjArgs(result,`
	`2139`	`+ &PyId_add_done_callback,`
	`2140`	`+ wrapper, NULL);`
`2140`	`2141`	`Py_DECREF(wrapper);`
`2141`	`2142`	`if (res == NULL) {`
`2142`	`2143`	`goto fail;`