Use _PyObject_CallNoArg()

vstinner · vstinner · commit f17c3de2635d · 2016-12-06T18:46:19.000+01:00
Replace:
    PyObject_CallFunctionObjArgs(callable, NULL)
with:
    _PyObject_CallNoArg(callable)
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
@@ -1948,7 +1948,7 @@ task_step_impl(TaskObj *task, PyObject *exc)
 
         if (!exc) {
             /* exc was not a CancelledError */
-            exc = PyObject_CallFunctionObjArgs(asyncio_CancelledError, NULL);
+            exc = _PyObject_CallNoArg(asyncio_CancelledError);
             if (!exc) {
                 goto fail;
             }
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
@@ -5258,7 +5258,7 @@ cast(void *ptr, PyObject *src, PyObject *ctype)
     CDataObject *result;
     if (0 == cast_check_pointertype(ctype))
         return NULL;
-    result = (CDataObject *)PyObject_CallFunctionObjArgs(ctype, NULL);
+    result = (CDataObject *)_PyObject_CallNoArg(ctype);
     if (result == NULL)
         return NULL;
 
diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c
@@ -181,7 +181,7 @@ static void _CallPythonObject(void *mem,
             */
         } else if (dict) {
             /* Hm, shouldn't we use PyCData_AtAddress() or something like that instead? */
-            CDataObject *obj = (CDataObject *)PyObject_CallFunctionObjArgs(cnv, NULL);
+            CDataObject *obj = (CDataObject *)_PyObject_CallNoArg(cnv);
             if (!obj) {
                 PrintError("create argument %d:\n", i);
                 Py_DECREF(cnv);
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -3197,7 +3197,7 @@ _password_callback(char *buf, int size, int rwflag, void *userdata)
     PySSL_END_ALLOW_THREADS_S(pw_info->thread_state);
 
     if (pw_info->callable) {
-        fn_ret = PyObject_CallFunctionObjArgs(pw_info->callable, NULL);
+        fn_ret = _PyObject_CallNoArg(pw_info->callable);
         if (!fn_ret) {
             /* TODO: It would be nice to move _ctypes_add_traceback() into the
                core python API, so we could use it to add a frame here */
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
@@ -951,7 +951,7 @@ static PyObject * math_ceil(PyObject *self, PyObject *number) {
             return NULL;
         return math_1_to_int(number, ceil, 0);
     }
-    result = PyObject_CallFunctionObjArgs(method, NULL);
+    result = _PyObject_CallNoArg(method);
     Py_DECREF(method);
     return result;
 }
@@ -991,7 +991,7 @@ static PyObject * math_floor(PyObject *self, PyObject *number) {
             return NULL;
         return math_1_to_int(number, floor, 0);
     }
-    result = PyObject_CallFunctionObjArgs(method, NULL);
+    result = _PyObject_CallNoArg(method);
     Py_DECREF(method);
     return result;
 }
@@ -1542,7 +1542,7 @@ math_trunc(PyObject *self, PyObject *number)
                          Py_TYPE(number)->tp_name);
         return NULL;
     }
-    result = PyObject_CallFunctionObjArgs(trunc, NULL);
+    result = _PyObject_CallNoArg(trunc);
     Py_DECREF(trunc);
     return result;
 }
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -902,7 +902,7 @@ path_converter(PyObject *o, void *p)
             goto error_exit;
         }
 
-        o = to_cleanup = PyObject_CallFunctionObjArgs(func, NULL);
+        o = to_cleanup = _PyObject_CallNoArg(func);
         Py_DECREF(func);
         if (NULL == o) {
             goto error_exit;
@@ -12046,7 +12046,7 @@ PyOS_FSPath(PyObject *path)
                             Py_TYPE(path)->tp_name);
     }
 
-    path_repr = PyObject_CallFunctionObjArgs(func, NULL);
+    path_repr = _PyObject_CallNoArg(func);
     Py_DECREF(func);
     if (NULL == path_repr) {
         return NULL;
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -103,7 +103,7 @@ PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
         }
         return defaultvalue;
     }
-    result = PyObject_CallFunctionObjArgs(hint, NULL);
+    result = _PyObject_CallNoArg(hint);
     Py_DECREF(hint);
     if (result == NULL) {
         if (PyErr_ExceptionMatches(PyExc_TypeError)) {
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -549,7 +549,7 @@ format_obj(PyObject *v, const char **pbuf, Py_ssize_t *plen)
     /* does it support __bytes__? */
     func = _PyObject_LookupSpecial(v, &PyId___bytes__);
     if (func != NULL) {
-        result = PyObject_CallFunctionObjArgs(func, NULL);
+        result = _PyObject_CallNoArg(func);
         Py_DECREF(func);
         if (result == NULL)
             return NULL;
@@ -2569,7 +2569,7 @@ bytes_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        PyObject_Bytes doesn't do. */
     func = _PyObject_LookupSpecial(x, &PyId___bytes__);
     if (func != NULL) {
-        new = PyObject_CallFunctionObjArgs(func, NULL);
+        new = _PyObject_CallNoArg(func);
         Py_DECREF(func);
         if (new == NULL)
             return NULL;
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
@@ -273,7 +273,7 @@ try_complex_special_method(PyObject *op) {
 
     f = _PyObject_LookupSpecial(op, &PyId___complex__);
     if (f) {
-        PyObject *res = PyObject_CallFunctionObjArgs(f, NULL);
+        PyObject *res = _PyObject_CallNoArg(f);
         Py_DECREF(f);
         if (res != NULL && !PyComplex_Check(res)) {
             PyErr_SetString(PyExc_TypeError,
diff --git a/Objects/enumobject.c b/Objects/enumobject.c
@@ -258,7 +258,7 @@ reversed_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         return NULL;
     }
     if (reversed_meth != NULL) {
-        PyObject *res = PyObject_CallFunctionObjArgs(reversed_meth, NULL);
+        PyObject *res = _PyObject_CallNoArg(reversed_meth);
         Py_DECREF(reversed_meth);
         return res;
     }
diff --git a/Objects/object.c b/Objects/object.c
@@ -596,7 +596,7 @@ PyObject_Bytes(PyObject *v)
 
     func = _PyObject_LookupSpecial(v, &PyId___bytes__);
     if (func != NULL) {
-        result = PyObject_CallFunctionObjArgs(func, NULL);
+        result = _PyObject_CallNoArg(func);
         Py_DECREF(func);
         if (result == NULL)
             return NULL;
@@ -1314,7 +1314,7 @@ _dir_object(PyObject *obj)
         return NULL;
     }
     /* use __dir__ */
-    result = PyObject_CallFunctionObjArgs(dirfunc, NULL);
+    result = _PyObject_CallNoArg(dirfunc);
     Py_DECREF(dirfunc);
     if (result == NULL)
         return NULL;
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
@@ -1256,7 +1256,7 @@ odict_copy(register PyODictObject *od)
     if (PyODict_CheckExact(od))
         od_copy = PyODict_New();
     else
-        od_copy = PyObject_CallFunctionObjArgs((PyObject *)Py_TYPE(od), NULL);
+        od_copy = _PyObject_CallNoArg((PyObject *)Py_TYPE(od));
     if (od_copy == NULL)
         return NULL;
 
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -2074,7 +2074,7 @@ builtin_round(PyObject *self, PyObject *args, PyObject *kwds)
     }
 
     if (ndigits == NULL || ndigits == Py_None)
-        result = PyObject_CallFunctionObjArgs(round, NULL);
+        result = _PyObject_CallNoArg(round);
     else
         result = PyObject_CallFunctionObjArgs(round, ndigits, NULL);
     Py_DECREF(round);
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -3062,7 +3062,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
             Py_DECREF(mgr);
             if (enter == NULL)
                 goto error;
-            res = PyObject_CallFunctionObjArgs(enter, NULL);
+            res = _PyObject_CallNoArg(enter);
             Py_DECREF(enter);
             if (res == NULL)
                 goto error;
@@ -3096,7 +3096,7 @@ _PyEval_EvalFrameDefault(PyFrameObject *f, int throwflag)
             }
             SET_TOP(exit);
             Py_DECREF(mgr);
-            res = PyObject_CallFunctionObjArgs(enter, NULL);
+            res = _PyObject_CallNoArg(enter);
             Py_DECREF(enter);
             if (res == NULL)
                 goto error;
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
@@ -1098,7 +1098,7 @@ _PySys_GetSizeOf(PyObject *o)
                          Py_TYPE(o)->tp_name);
     }
     else {
-        res = PyObject_CallFunctionObjArgs(method, NULL);
+        res = _PyObject_CallNoArg(method);
         Py_DECREF(method);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1948,7 +1948,7 @@ task_step_impl(TaskObj task, PyObject exc)`
`1948`	`1948`
`1949`	`1949`	`if (!exc) {`
`1950`	`1950`	`/* exc was not a CancelledError */`
`1951`		`- exc = PyObject_CallFunctionObjArgs(asyncio_CancelledError, NULL);`
	`1951`	`+ exc = _PyObject_CallNoArg(asyncio_CancelledError);`
`1952`	`1952`	`if (!exc) {`
`1953`	`1953`	`goto fail;`
`1954`	`1954`	`}`
Original file line number	Diff line number	Diff line change
`@@ -951,7 +951,7 @@ static PyObject * math_ceil(PyObject self, PyObject number) {`
`951`	`951`	`return NULL;`
`952`	`952`	`return math_1_to_int(number, ceil, 0);`
`953`	`953`	`}`
`954`		`- result = PyObject_CallFunctionObjArgs(method, NULL);`
	`954`	`+ result = _PyObject_CallNoArg(method);`
`955`	`955`	`Py_DECREF(method);`
`956`	`956`	`return result;`
`957`	`957`	`}`
`@@ -991,7 +991,7 @@ static PyObject * math_floor(PyObject self, PyObject number) {`
`991`	`991`	`return NULL;`
`992`	`992`	`return math_1_to_int(number, floor, 0);`
`993`	`993`	`}`
`994`		`- result = PyObject_CallFunctionObjArgs(method, NULL);`
	`994`	`+ result = _PyObject_CallNoArg(method);`
`995`	`995`	`Py_DECREF(method);`
`996`	`996`	`return result;`
`997`	`997`	`}`
`@@ -1542,7 +1542,7 @@ math_trunc(PyObject self, PyObject number)`
`1542`	`1542`	`Py_TYPE(number)->tp_name);`
`1543`	`1543`	`return NULL;`
`1544`	`1544`	`}`
`1545`		`- result = PyObject_CallFunctionObjArgs(trunc, NULL);`
	`1545`	`+ result = _PyObject_CallNoArg(trunc);`
`1546`	`1546`	`Py_DECREF(trunc);`
`1547`	`1547`	`return result;`
`1548`	`1548`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)`
`103`	`103`	`}`
`104`	`104`	`return defaultvalue;`
`105`	`105`	`}`
`106`		`- result = PyObject_CallFunctionObjArgs(hint, NULL);`
	`106`	`+ result = _PyObject_CallNoArg(hint);`
`107`	`107`	`Py_DECREF(hint);`
`108`	`108`	`if (result == NULL) {`
`109`	`109`	`if (PyErr_ExceptionMatches(PyExc_TypeError)) {`
Original file line number	Diff line number	Diff line change
`@@ -258,7 +258,7 @@ reversed_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`258`	`258`	`return NULL;`
`259`	`259`	`}`
`260`	`260`	`if (reversed_meth != NULL) {`
`261`		`- PyObject *res = PyObject_CallFunctionObjArgs(reversed_meth, NULL);`
	`261`	`+ PyObject *res = _PyObject_CallNoArg(reversed_meth);`
`262`	`262`	`Py_DECREF(reversed_meth);`
`263`	`263`	`return res;`
`264`	`264`	`}`