bpo-37493: use _PyObject_CallNoArg in more places (GH-14575)
diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
index cc7d3cf..7e9cf8a 100644
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -1976,7 +1976,7 @@
Py_DECREF(tup);
return NULL;
}
- value = PyEval_CallObject(factory, NULL);
+ value = _PyObject_CallNoArg(factory);
if (value == NULL)
return value;
if (PyObject_SetItem((PyObject *)dd, key, value) < 0) {
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
index 2201c45..c6ae487 100644
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -1001,8 +1001,8 @@
stgdict items size, align, length contain info about pointers itself,
stgdict->proto has info about the pointed to type!
*/
- stgdict = (StgDictObject *)PyObject_CallObject(
- (PyObject *)&PyCStgDict_Type, NULL);
+ stgdict = (StgDictObject *)_PyObject_CallNoArg(
+ (PyObject *)&PyCStgDict_Type);
if (!stgdict)
return NULL;
stgdict->size = sizeof(void *);
@@ -1489,8 +1489,8 @@
goto error;
}
- stgdict = (StgDictObject *)PyObject_CallObject(
- (PyObject *)&PyCStgDict_Type, NULL);
+ stgdict = (StgDictObject *)_PyObject_CallNoArg(
+ (PyObject *)&PyCStgDict_Type);
if (!stgdict)
goto error;
@@ -1946,8 +1946,8 @@
if (result == NULL)
return NULL;
- stgdict = (StgDictObject *)PyObject_CallObject(
- (PyObject *)&PyCStgDict_Type, NULL);
+ stgdict = (StgDictObject *)_PyObject_CallNoArg(
+ (PyObject *)&PyCStgDict_Type);
if (!stgdict) {
Py_DECREF(result);
return NULL;
@@ -2060,8 +2060,8 @@
goto error;
}
- stgdict = (StgDictObject *)PyObject_CallObject(
- (PyObject *)&PyCStgDict_Type, NULL);
+ stgdict = (StgDictObject *)_PyObject_CallNoArg(
+ (PyObject *)&PyCStgDict_Type);
if (!stgdict)
goto error;
@@ -2454,8 +2454,8 @@
PyTypeObject *result;
StgDictObject *stgdict;
- stgdict = (StgDictObject *)PyObject_CallObject(
- (PyObject *)&PyCStgDict_Type, NULL);
+ stgdict = (StgDictObject *)_PyObject_CallNoArg(
+ (PyObject *)&PyCStgDict_Type);
if (!stgdict)
return NULL;
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
index 95367d5..e0a50fd 100644
--- a/Modules/_ctypes/cfield.c
+++ b/Modules/_ctypes/cfield.c
@@ -60,8 +60,7 @@
#define CONT_BITFIELD 2
#define EXPAND_BITFIELD 3
- self = (CFieldObject *)PyObject_CallObject((PyObject *)&PyCField_Type,
- NULL);
+ self = (CFieldObject *)_PyObject_CallNoArg((PyObject *)&PyCField_Type);
if (self == NULL)
return NULL;
dict = PyType_stgdict(desc);
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 07aadea..8f34e93 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -4907,7 +4907,7 @@
return NULL;
}
- PyObject *res = PyObject_CallObject(cls, NULL);
+ PyObject *res = _PyObject_CallNoArg(cls);
if (res == NULL) {
return NULL;
}
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index b848710..777e933 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -433,7 +433,7 @@
for (i = 0; i < PyList_GET_SIZE(cpy); i++) {
PyObject *func, *res;
func = PyList_GET_ITEM(cpy, i);
- res = PyObject_CallObject(func, NULL);
+ res = _PyObject_CallNoArg(func);
if (res == NULL)
PyErr_WriteUnraisable(func);
else