Skip to content

Commit a5ed5f0

Browse files
vstinnervstinner
committed
Use _PyObject_CallNoArg()
Replace: PyObject_CallObject(callable, NULL) with: _PyObject_CallNoArg(callable)
1 parent 2a358f8 commit a5ed5f0

11 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎Modules/_asynciomodule.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ future_init(FutureObj *fut, PyObject *loop)
141141
_Py_IDENTIFIER(get_debug);
142142

143143
if (loop == NULL || loop == Py_None) {
144-
loop = PyObject_CallObject(asyncio_get_event_loop, NULL);
144+
loop = _PyObject_CallNoArg(asyncio_get_event_loop);
145145
if (loop == NULL) {
146146
return -1;
147147
}
@@ -158,7 +158,7 @@ future_init(FutureObj *fut, PyObject *loop)
158158
}
159159
if (PyObject_IsTrue(res)) {
160160
Py_CLEAR(res);
161-
fut->fut_source_tb = PyObject_CallObject(traceback_extract_stack, NULL);
161+
fut->fut_source_tb = _PyObject_CallNoArg(traceback_extract_stack);
162162
if (fut->fut_source_tb == NULL) {
163163
return -1;
164164
}
@@ -204,7 +204,7 @@ future_set_exception(FutureObj *fut, PyObject *exc)
204204
}
205205

206206
if (PyExceptionClass_Check(exc)) {
207-
exc_val = PyObject_CallObject(exc, NULL);
207+
exc_val = _PyObject_CallNoArg(exc);
208208
if (exc_val == NULL) {
209209
return NULL;
210210
}
@@ -1429,7 +1429,7 @@ _asyncio_Task_current_task_impl(PyTypeObject *type, PyObject *loop)
14291429
PyObject *res;
14301430

14311431
if (loop == NULL) {
1432-
loop = PyObject_CallObject(asyncio_get_event_loop, NULL);
1432+
loop = _PyObject_CallNoArg(asyncio_get_event_loop);
14331433
if (loop == NULL) {
14341434
return NULL;
14351435
}
@@ -1514,7 +1514,7 @@ _asyncio_Task_all_tasks_impl(PyTypeObject *type, PyObject *loop)
15141514
PyObject *res;
15151515

15161516
if (loop == NULL) {
1517-
loop = PyObject_CallObject(asyncio_get_event_loop, NULL);
1517+
loop = _PyObject_CallNoArg(asyncio_get_event_loop);
15181518
if (loop == NULL) {
15191519
return NULL;
15201520
}
@@ -2387,7 +2387,7 @@ module_init(void)
23872387

23882388
WITH_MOD("weakref")
23892389
GET_MOD_ATTR(cls, "WeakSet")
2390-
all_tasks = PyObject_CallObject(cls, NULL);
2390+
all_tasks = _PyObject_CallNoArg(cls);
23912391
Py_CLEAR(cls);
23922392
if (all_tasks == NULL) {
23932393
goto fail;

‎Modules/_ctypes/_ctypes.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ PyDict_SetItemProxy(PyObject *dict, PyObject *key, PyObject *item)
211211
PyObject *proxy;
212212
int result;
213213

214-
obj = PyObject_CallObject((PyObject *)&DictRemover_Type, NULL);
214+
obj = _PyObject_CallNoArg((PyObject *)&DictRemover_Type);
215215
if (obj == NULL)
216216
return -1;
217217

@@ -373,7 +373,7 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt
373373
if (PyDict_GetItemString(result->tp_dict, "_abstract_"))
374374
return (PyObject *)result;
375375

376-
dict = (StgDictObject *)PyObject_CallObject((PyObject *)&PyCStgDict_Type, NULL);
376+
dict = (StgDictObject *)_PyObject_CallNoArg((PyObject *)&PyCStgDict_Type);
377377
if (!dict) {
378378
Py_DECREF(result);
379379
return NULL;
@@ -3654,10 +3654,10 @@ _build_callargs(PyCFuncPtrObject *self, PyObject *argtypes,
36543654
goto error;
36553655
}
36563656
if (PyCArrayTypeObject_Check(ob))
3657-
ob = PyObject_CallObject(ob, NULL);
3657+
ob = _PyObject_CallNoArg(ob);
36583658
else
36593659
/* Create an instance of the pointed-to type */
3660-
ob = PyObject_CallObject(dict->proto, NULL);
3660+
ob = _PyObject_CallNoArg(dict->proto);
36613661
/*
36623662
XXX Is the following correct any longer?
36633663
We must not pass a byref() to the array then but

‎Modules/_ctypes/stgdict.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ MakeFields(PyObject *type, CFieldObject *descr,
228228
}
229229
continue;
230230
}
231-
new_descr = (CFieldObject *)PyObject_CallObject((PyObject *)&PyCField_Type, NULL);
231+
new_descr = (CFieldObject *)_PyObject_CallNoArg((PyObject *)&PyCField_Type);
232232
if (new_descr == NULL) {
233233
Py_DECREF(fdescr);
234234
Py_DECREF(fieldlist);

‎Modules/_decimal/_decimal.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,13 +1194,13 @@ context_new(PyTypeObject *type, PyObject *args UNUSED, PyObject *kwds UNUSED)
11941194
return NULL;
11951195
}
11961196

1197-
self->traps = PyObject_CallObject((PyObject *)PyDecSignalDict_Type, NULL);
1197+
self->traps = _PyObject_CallNoArg((PyObject *)PyDecSignalDict_Type);
11981198
if (self->traps == NULL) {
11991199
self->flags = NULL;
12001200
Py_DECREF(self);
12011201
return NULL;
12021202
}
1203-
self->flags = PyObject_CallObject((PyObject *)PyDecSignalDict_Type, NULL);
1203+
self->flags = _PyObject_CallNoArg((PyObject *)PyDecSignalDict_Type);
12041204
if (self->flags == NULL) {
12051205
Py_DECREF(self);
12061206
return NULL;
@@ -1395,7 +1395,7 @@ ieee_context(PyObject *dummy UNUSED, PyObject *v)
13951395
goto error;
13961396
}
13971397

1398-
context = PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL);
1398+
context = _PyObject_CallNoArg((PyObject *)&PyDecContext_Type);
13991399
if (context == NULL) {
14001400
return NULL;
14011401
}
@@ -1417,7 +1417,7 @@ context_copy(PyObject *self, PyObject *args UNUSED)
14171417
{
14181418
PyObject *copy;
14191419

1420-
copy = PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL);
1420+
copy = _PyObject_CallNoArg((PyObject *)&PyDecContext_Type);
14211421
if (copy == NULL) {
14221422
return NULL;
14231423
}
@@ -5835,15 +5835,15 @@ PyInit__decimal(void)
58355835

58365836
/* Init default context template first */
58375837
ASSIGN_PTR(default_context_template,
5838-
PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL));
5838+
_PyObject_CallNoArg((PyObject *)&PyDecContext_Type));
58395839
Py_INCREF(default_context_template);
58405840
CHECK_INT(PyModule_AddObject(m, "DefaultContext",
58415841
default_context_template));
58425842

58435843
#ifdef WITHOUT_THREADS
58445844
/* Init module context */
58455845
ASSIGN_PTR(module_context,
5846-
PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL));
5846+
_PyObject_CallNoArg((PyObject *)&PyDecContext_Type));
58475847
Py_INCREF(Py_False);
58485848
CHECK_INT(PyModule_AddObject(m, "HAVE_THREADS", Py_False));
58495849
#else
@@ -5854,15 +5854,15 @@ PyInit__decimal(void)
58545854

58555855
/* Init basic context template */
58565856
ASSIGN_PTR(basic_context_template,
5857-
PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL));
5857+
_PyObject_CallNoArg((PyObject *)&PyDecContext_Type));
58585858
init_basic_context(basic_context_template);
58595859
Py_INCREF(basic_context_template);
58605860
CHECK_INT(PyModule_AddObject(m, "BasicContext",
58615861
basic_context_template));
58625862

58635863
/* Init extended context template */
58645864
ASSIGN_PTR(extended_context_template,
5865-
PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL));
5865+
_PyObject_CallNoArg((PyObject *)&PyDecContext_Type));
58665866
init_extended_context(extended_context_template);
58675867
Py_INCREF(extended_context_template);
58685868
CHECK_INT(PyModule_AddObject(m, "ExtendedContext",

‎Modules/_functoolsmodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1246,7 +1246,7 @@ PyInit__functools(void)
12461246
if (m == NULL)
12471247
return NULL;
12481248

1249-
kwd_mark = PyObject_CallObject((PyObject *)&PyBaseObject_Type, NULL);
1249+
kwd_mark = _PyObject_CallNoArg((PyObject *)&PyBaseObject_Type);
12501250
if (!kwd_mark) {
12511251
Py_DECREF(m);
12521252
return NULL;

‎Modules/_testcapimodule.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2277,7 +2277,7 @@ static int _pending_callback(void *arg)
22772277
{
22782278
/* we assume the argument is callable object to which we own a reference */
22792279
PyObject *callable = (PyObject *)arg;
2280-
PyObject *r = PyObject_CallObject(callable, NULL);
2280+
PyObject *r = _PyObject_CallNoArg(callable);
22812281
Py_DECREF(callable);
22822282
Py_XDECREF(r);
22832283
return r != NULL ? 0 : -1;

‎Modules/main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ static void RunInteractiveHook(void)
157157
if (hook == NULL)
158158
PyErr_Clear();
159159
else {
160-
result = PyObject_CallObject(hook, NULL);
160+
result = _PyObject_CallNoArg(hook);
161161
Py_DECREF(hook);
162162
if (result == NULL)
163163
goto error;

‎Objects/dictobject.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1843,7 +1843,7 @@ _PyDict_FromKeys(PyObject *cls, PyObject *iterable, PyObject *value)
18431843
PyObject *d;
18441844
int status;
18451845

1846-
d = PyObject_CallObject(cls, NULL);
1846+
d = _PyObject_CallNoArg(cls);
18471847
if (d == NULL)
18481848
return NULL;
18491849

‎Objects/typeobject.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1856,7 +1856,7 @@ mro_invoke(PyTypeObject *type)
18561856
PyObject *mro_meth = lookup_method((PyObject *)type, &PyId_mro);
18571857
if (mro_meth == NULL)
18581858
return NULL;
1859-
mro_result = PyObject_CallObject(mro_meth, NULL);
1859+
mro_result = _PyObject_CallNoArg(mro_meth);
18601860
Py_DECREF(mro_meth);
18611861
}
18621862
else {
@@ -4032,7 +4032,7 @@ _PyObject_GetState(PyObject *obj, int required)
40324032
Py_DECREF(slotnames);
40334033
}
40344034
else { /* getstate != NULL */
4035-
state = PyObject_CallObject(getstate, NULL);
4035+
state = _PyObject_CallNoArg(getstate);
40364036
Py_DECREF(getstate);
40374037
if (state == NULL)
40384038
return NULL;
@@ -4057,7 +4057,7 @@ _PyObject_GetNewArguments(PyObject *obj, PyObject **args, PyObject **kwargs)
40574057
__getnewargs_ex__ on the object. */
40584058
getnewargs_ex = _PyObject_LookupSpecial(obj, &PyId___getnewargs_ex__);
40594059
if (getnewargs_ex != NULL) {
4060-
PyObject *newargs = PyObject_CallObject(getnewargs_ex, NULL);
4060+
PyObject *newargs = _PyObject_CallNoArg(getnewargs_ex);
40614061
Py_DECREF(getnewargs_ex);
40624062
if (newargs == NULL) {
40634063
return -1;
@@ -4110,7 +4110,7 @@ _PyObject_GetNewArguments(PyObject *obj, PyObject **args, PyObject **kwargs)
41104110
__getnewargs__ instead. */
41114111
getnewargs = _PyObject_LookupSpecial(obj, &PyId___getnewargs__);
41124112
if (getnewargs != NULL) {
4113-
*args = PyObject_CallObject(getnewargs, NULL);
4113+
*args = _PyObject_CallNoArg(getnewargs);
41144114
Py_DECREF(getnewargs);
41154115
if (*args == NULL) {
41164116
return -1;
@@ -4362,7 +4362,7 @@ object_reduce_ex(PyObject *self, PyObject *args)
43624362
override = (clsreduce != objreduce);
43634363
Py_DECREF(clsreduce);
43644364
if (override) {
4365-
res = PyObject_CallObject(reduce, NULL);
4365+
res = _PyObject_CallNoArg(reduce);
43664366
Py_DECREF(reduce);
43674367
return res;
43684368
}

‎Parser/tokenizer.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ fp_readl(char *s, int size, struct tok_state *tok)
440440
}
441441
else
442442
{
443-
bufobj = PyObject_CallObject(tok->decoding_readline, NULL);
443+
bufobj = _PyObject_CallNoArg(tok->decoding_readline);
444444
if (bufobj == NULL)
445445
goto error;
446446
}
@@ -533,7 +533,7 @@ fp_setreadl(struct tok_state *tok, const char* enc)
533533
Py_XSETREF(tok->decoding_readline, readline);
534534

535535
if (pos > 0) {
536-
PyObject *bufobj = PyObject_CallObject(readline, NULL);
536+
PyObject *bufobj = _PyObject_CallNoArg(readline);
537537
if (bufobj == NULL)
538538
return 0;
539539
Py_DECREF(bufobj);
@@ -650,7 +650,7 @@ decoding_feof(struct tok_state *tok)
650650
} else {
651651
PyObject* buf = tok->decoding_buffer;
652652
if (buf == NULL) {
653-
buf = PyObject_CallObject(tok->decoding_readline, NULL);
653+
buf = _PyObject_CallNoArg(tok->decoding_readline);
654654
if (buf == NULL) {
655655
error_ret(tok);
656656
return 1;

0 commit comments

Comments
 (0)