bpo-37493: use _PyObject_CallNoArg in more places (GH-14575)

This commit is contained in:
Jeroen Demeyer 2019-07-04 12:35:31 +02:00 committed by Inada Naoki
parent 196a530e00
commit 7f41c8e0dd
6 changed files with 15 additions and 16 deletions

View File

@ -104,7 +104,7 @@ done. This can be done using the :c:func:`PyErr_Fetch` and
/* This saves the current exception state */ /* This saves the current exception state */
PyErr_Fetch(&err_type, &err_value, &err_traceback); PyErr_Fetch(&err_type, &err_value, &err_traceback);
cbresult = PyObject_CallObject(self->my_callback, NULL); cbresult = PyObject_CallNoArgs(self->my_callback);
if (cbresult == NULL) if (cbresult == NULL)
PyErr_WriteUnraisable(self->my_callback); PyErr_WriteUnraisable(self->my_callback);
else else

View File

@ -1976,7 +1976,7 @@ defdict_missing(defdictobject *dd, PyObject *key)
Py_DECREF(tup); Py_DECREF(tup);
return NULL; return NULL;
} }
value = PyEval_CallObject(factory, NULL); value = _PyObject_CallNoArg(factory);
if (value == NULL) if (value == NULL)
return value; return value;
if (PyObject_SetItem((PyObject *)dd, key, value) < 0) { if (PyObject_SetItem((PyObject *)dd, key, value) < 0) {

View File

@ -1001,8 +1001,8 @@ PyCPointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
stgdict items size, align, length contain info about pointers itself, stgdict items size, align, length contain info about pointers itself,
stgdict->proto has info about the pointed to type! stgdict->proto has info about the pointed to type!
*/ */
stgdict = (StgDictObject *)PyObject_CallObject( stgdict = (StgDictObject *)_PyObject_CallNoArg(
(PyObject *)&PyCStgDict_Type, NULL); (PyObject *)&PyCStgDict_Type);
if (!stgdict) if (!stgdict)
return NULL; return NULL;
stgdict->size = sizeof(void *); stgdict->size = sizeof(void *);
@ -1489,8 +1489,8 @@ PyCArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
goto error; goto error;
} }
stgdict = (StgDictObject *)PyObject_CallObject( stgdict = (StgDictObject *)_PyObject_CallNoArg(
(PyObject *)&PyCStgDict_Type, NULL); (PyObject *)&PyCStgDict_Type);
if (!stgdict) if (!stgdict)
goto error; goto error;
@ -1946,8 +1946,8 @@ static PyObject *CreateSwappedType(PyTypeObject *type, PyObject *args, PyObject
if (result == NULL) if (result == NULL)
return NULL; return NULL;
stgdict = (StgDictObject *)PyObject_CallObject( stgdict = (StgDictObject *)_PyObject_CallNoArg(
(PyObject *)&PyCStgDict_Type, NULL); (PyObject *)&PyCStgDict_Type);
if (!stgdict) { if (!stgdict) {
Py_DECREF(result); Py_DECREF(result);
return NULL; return NULL;
@ -2060,8 +2060,8 @@ PyCSimpleType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
goto error; goto error;
} }
stgdict = (StgDictObject *)PyObject_CallObject( stgdict = (StgDictObject *)_PyObject_CallNoArg(
(PyObject *)&PyCStgDict_Type, NULL); (PyObject *)&PyCStgDict_Type);
if (!stgdict) if (!stgdict)
goto error; goto error;
@ -2454,8 +2454,8 @@ PyCFuncPtrType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
PyTypeObject *result; PyTypeObject *result;
StgDictObject *stgdict; StgDictObject *stgdict;
stgdict = (StgDictObject *)PyObject_CallObject( stgdict = (StgDictObject *)_PyObject_CallNoArg(
(PyObject *)&PyCStgDict_Type, NULL); (PyObject *)&PyCStgDict_Type);
if (!stgdict) if (!stgdict)
return NULL; return NULL;

View File

@ -60,8 +60,7 @@ PyCField_FromDesc(PyObject *desc, Py_ssize_t index,
#define CONT_BITFIELD 2 #define CONT_BITFIELD 2
#define EXPAND_BITFIELD 3 #define EXPAND_BITFIELD 3
self = (CFieldObject *)PyObject_CallObject((PyObject *)&PyCField_Type, self = (CFieldObject *)_PyObject_CallNoArg((PyObject *)&PyCField_Type);
NULL);
if (self == NULL) if (self == NULL)
return NULL; return NULL;
dict = PyType_stgdict(desc); dict = PyType_stgdict(desc);

View File

@ -4907,7 +4907,7 @@ bad_get(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
return NULL; return NULL;
} }
PyObject *res = PyObject_CallObject(cls, NULL); PyObject *res = _PyObject_CallNoArg(cls);
if (res == NULL) { if (res == NULL) {
return NULL; return NULL;
} }

View File

@ -433,7 +433,7 @@ run_at_forkers(PyObject *lst, int reverse)
for (i = 0; i < PyList_GET_SIZE(cpy); i++) { for (i = 0; i < PyList_GET_SIZE(cpy); i++) {
PyObject *func, *res; PyObject *func, *res;
func = PyList_GET_ITEM(cpy, i); func = PyList_GET_ITEM(cpy, i);
res = PyObject_CallObject(func, NULL); res = _PyObject_CallNoArg(func);
if (res == NULL) if (res == NULL)
PyErr_WriteUnraisable(func); PyErr_WriteUnraisable(func);
else else