commit 59ad110d7a7784d53d0b502eebce0346597a6bef
author Jeroen Demeyer <J.Demeyer@UGent.be> Thu Jul 11 10:59:05 2019 +0200
committer Inada Naoki <songofacandy@gmail.com> Thu Jul 11 17:59:05 2019 +0900
tree 8ccd39e358017efe2abe41912c2f9d567ee9f248
parent 2a3d4d9c53dd4831c3ecf56bc7c4a289c33030d6

bpo-37547: add _PyObject_CallMethodOneArg (GH-14685)

Objects/dictobject.c

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 422f4b0..b6205d9 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -4159,7 +4159,7 @@
     if (result == NULL)
         return NULL;
 
-    tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_difference_update, other, NULL);
+    tmp = _PyObject_CallMethodIdOneArg(result, &PyId_difference_update, other);
     if (tmp == NULL) {
         Py_DECREF(result);
         return NULL;
@@ -4179,7 +4179,7 @@
     if (result == NULL)
         return NULL;
 
-    tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_intersection_update, other, NULL);
+    tmp = _PyObject_CallMethodIdOneArg(result, &PyId_intersection_update, other);
     if (tmp == NULL) {
         Py_DECREF(result);
         return NULL;
@@ -4199,7 +4199,7 @@
     if (result == NULL)
         return NULL;
 
-    tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_update, other, NULL);
+    tmp = _PyObject_CallMethodIdOneArg(result, &PyId_update, other);
     if (tmp == NULL) {
         Py_DECREF(result);
         return NULL;
@@ -4219,7 +4219,7 @@
     if (result == NULL)
         return NULL;
 
-    tmp = _PyObject_CallMethodIdObjArgs(result, &PyId_symmetric_difference_update, other, NULL);
+    tmp = _PyObject_CallMethodIdOneArg(result, &PyId_symmetric_difference_update, other);
     if (tmp == NULL) {
         Py_DECREF(result);
         return NULL;

Objects/typeobject.c

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 96021ee..8acf678 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4145,8 +4145,8 @@
     /* Use _slotnames function from the copyreg module to find the slots
        by this class and its bases. This function will cache the result
        in __slotnames__. */
-    slotnames = _PyObject_CallMethodIdObjArgs(copyreg, &PyId__slotnames,
-                                              cls, NULL);
+    slotnames = _PyObject_CallMethodIdOneArg(copyreg, &PyId__slotnames,
+                                             (PyObject *)cls);
     Py_DECREF(copyreg);
     if (slotnames == NULL)
         return NULL;