Use _PyObject_CallMethodIdObjArgs()

vstinner · vstinner · commit 55ba38a48097 · 2016-12-09T16:09:30.000+01:00
Issue #28915: Replace _PyObject_CallMethodId() with _PyObject_CallMethodIdObjArgs() in various modules when the format string was only made of "O" formats, PyObject* arguments. _PyObject_CallMethodIdObjArgs() avoids the creation of a temporary tuple and doesn't have to parse a format string.
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
@@ -4571,8 +4571,8 @@ find_class(UnpicklerObject *self, PyObject *module_name, PyObject *global_name)
 {
     _Py_IDENTIFIER(find_class);
 
-    return _PyObject_CallMethodId((PyObject *)self, &PyId_find_class, "OO",
-                                  module_name, global_name);
+    return _PyObject_CallMethodIdObjArgs((PyObject *)self, &PyId_find_class,
+                                         module_name, global_name, NULL);
 }
 
 static Py_ssize_t
@@ -5184,7 +5184,7 @@ instantiate(PyObject *cls, PyObject *args)
     else {
         _Py_IDENTIFIER(__new__);
 
-        result = _PyObject_CallMethodId(cls, &PyId___new__, "O", cls);
+        result = _PyObject_CallMethodIdObjArgs(cls, &PyId___new__, cls, NULL);
     }
     return result;
 }
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -1445,7 +1445,7 @@ array_array_tofile(arrayobject *self, PyObject *f)
         bytes = PyBytes_FromStringAndSize(ptr, size);
         if (bytes == NULL)
             return NULL;
-        res = _PyObject_CallMethodId(f, &PyId_write, "O", bytes);
+        res = _PyObject_CallMethodIdObjArgs(f, &PyId_write, bytes, NULL);
         Py_DECREF(bytes);
         if (res == NULL)
             return NULL;
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
@@ -1611,7 +1611,7 @@ mbstreamwriter_iwrite(MultibyteStreamWriterObject *self,
     if (str == NULL)
         return -1;
 
-    wr = _PyObject_CallMethodId(self->stream, &PyId_write, "O", str);
+    wr = _PyObject_CallMethodIdObjArgs(self->stream, &PyId_write, str, NULL);
     Py_DECREF(str);
     if (wr == NULL)
         return -1;
@@ -1702,7 +1702,7 @@ _multibytecodec_MultibyteStreamWriter_reset_impl(MultibyteStreamWriterObject *se
     if (PyBytes_Size(pwrt) > 0) {
         PyObject *wr;
 
-        wr = _PyObject_CallMethodId(self->stream, &PyId_write, "O", pwrt);
+        wr = _PyObject_CallMethodIdObjArgs(self->stream, &PyId_write, pwrt);
         if (wr == NULL) {
             Py_DECREF(pwrt);
             return NULL;
diff --git a/Python/_warnings.c b/Python/_warnings.c
@@ -26,7 +26,7 @@ check_matched(PyObject *obj, PyObject *arg)
 
     if (obj == Py_None)
         return 1;
-    result = _PyObject_CallMethodId(obj, &PyId_match, "O", arg);
+    result = _PyObject_CallMethodIdObjArgs(obj, &PyId_match, arg, NULL);
     if (result == NULL)
         return -1;
 
diff --git a/Python/import.c b/Python/import.c
@@ -1705,7 +1705,7 @@ PyImport_ReloadModule(PyObject *m)
         Py_INCREF(imp);
     }
 
-    reloaded_module = _PyObject_CallMethodId(imp, &PyId_reload, "O", m);
+    reloaded_module = _PyObject_CallMethodIdObjArgs(imp, &PyId_reload, m, NULL);
     Py_DECREF(imp);
     return reloaded_module;
 }
diff --git a/Python/marshal.c b/Python/marshal.c
@@ -1649,7 +1649,7 @@ marshal_dump(PyObject *self, PyObject *args)
     s = PyMarshal_WriteObjectToString(x, version);
     if (s == NULL)
         return NULL;
-    res = _PyObject_CallMethodId(f, &PyId_write, "O", s);
+    res = _PyObject_CallMethodIdObjArgs(f, &PyId_write, s, NULL);
     Py_DECREF(s);
     return res;
 }

Original file line number	Diff line number	Diff line change
`@@ -4571,8 +4571,8 @@ find_class(UnpicklerObject self, PyObject module_name, PyObject *global_name)`
`4571`	`4571`	`{`
`4572`	`4572`	`_Py_IDENTIFIER(find_class);`
`4573`	`4573`
`4574`		`- return _PyObject_CallMethodId((PyObject *)self, &PyId_find_class, "OO",`
`4575`		`- module_name, global_name);`
	`4574`	`+ return _PyObject_CallMethodIdObjArgs((PyObject *)self, &PyId_find_class,`
	`4575`	`+ module_name, global_name, NULL);`
`4576`	`4576`	`}`
`4577`	`4577`
`4578`	`4578`	`static Py_ssize_t`
`@@ -5184,7 +5184,7 @@ instantiate(PyObject cls, PyObject args)`
`5184`	`5184`	`else {`
`5185`	`5185`	`_Py_IDENTIFIER(__new__);`
`5186`	`5186`
`5187`		`- result = _PyObject_CallMethodId(cls, &PyId___new__, "O", cls);`
	`5187`	`+ result = _PyObject_CallMethodIdObjArgs(cls, &PyId___new__, cls, NULL);`
`5188`	`5188`	`}`
`5189`	`5189`	`return result;`
`5190`	`5190`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1705,7 +1705,7 @@ PyImport_ReloadModule(PyObject *m)`
`1705`	`1705`	`Py_INCREF(imp);`
`1706`	`1706`	`}`
`1707`	`1707`
`1708`		`- reloaded_module = _PyObject_CallMethodId(imp, &PyId_reload, "O", m);`
	`1708`	`+ reloaded_module = _PyObject_CallMethodIdObjArgs(imp, &PyId_reload, m, NULL);`
`1709`	`1709`	`Py_DECREF(imp);`
`1710`	`1710`	`return reloaded_module;`
`1711`	`1711`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1649,7 +1649,7 @@ marshal_dump(PyObject self, PyObject args)`
`1649`	`1649`	`s = PyMarshal_WriteObjectToString(x, version);`
`1650`	`1650`	`if (s == NULL)`
`1651`	`1651`	`return NULL;`
`1652`		`- res = _PyObject_CallMethodId(f, &PyId_write, "O", s);`
	`1652`	`+ res = _PyObject_CallMethodIdObjArgs(f, &PyId_write, s, NULL);`
`1653`	`1653`	`Py_DECREF(s);`
`1654`	`1654`	`return res;`
`1655`	`1655`	`}`