[Python-checkins] cpython: Use _PyObject_CallNoArg()

victor.stinner python-checkins at python.org
Tue Dec 6 12:48:12 EST 2016

• Previous message (by thread): [Python-checkins] cpython: Use _PyObject_CallNoArg()
• Next message (by thread): [Python-checkins] cpython: Fix typo in a comment of abstract.c
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

https://hg.python.org/cpython/rev/54a89144ee1d
changeset: 105485:54a89144ee1d
user: Victor Stinner <victor.stinner at gmail.com>
date: Tue Dec 06 18:45:50 2016 +0100
summary:
 Use _PyObject_CallNoArg()
Replace:
 PyObject_CallObject(callable, NULL)
with:
 _PyObject_CallNoArg(callable)
files:
 Modules/_asynciomodule.c | 12 ++++++------
 Modules/_ctypes/_ctypes.c | 8 ++++----
 Modules/_ctypes/stgdict.c | 2 +-
 Modules/_decimal/_decimal.c | 16 ++++++++--------
 Modules/_functoolsmodule.c | 2 +-
 Modules/_testcapimodule.c | 2 +-
 Modules/main.c | 2 +-
 Objects/dictobject.c | 2 +-
 Objects/typeobject.c | 10 +++++-----
 Parser/tokenizer.c | 6 +++---
 Python/ceval.c | 4 ++--
 11 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -141,7 +141,7 @@
 _Py_IDENTIFIER(get_debug);
 
 if (loop == NULL || loop == Py_None) {
- loop = PyObject_CallObject(asyncio_get_event_loop, NULL);
+ loop = _PyObject_CallNoArg(asyncio_get_event_loop);
 if (loop == NULL) {
 return -1;
 }
@@ -158,7 +158,7 @@
 }
 if (PyObject_IsTrue(res)) {
 Py_CLEAR(res);
- fut->fut_source_tb = PyObject_CallObject(traceback_extract_stack, NULL);
+ fut->fut_source_tb = _PyObject_CallNoArg(traceback_extract_stack);
 if (fut->fut_source_tb == NULL) {
 return -1;
 }
@@ -204,7 +204,7 @@
 }
 
 if (PyExceptionClass_Check(exc)) {
- exc_val = PyObject_CallObject(exc, NULL);
+ exc_val = _PyObject_CallNoArg(exc);
 if (exc_val == NULL) {
 return NULL;
 }
@@ -1429,7 +1429,7 @@
 PyObject *res;
 
 if (loop == NULL) {
- loop = PyObject_CallObject(asyncio_get_event_loop, NULL);
+ loop = _PyObject_CallNoArg(asyncio_get_event_loop);
 if (loop == NULL) {
 return NULL;
 }
@@ -1514,7 +1514,7 @@
 PyObject *res;
 
 if (loop == NULL) {
- loop = PyObject_CallObject(asyncio_get_event_loop, NULL);
+ loop = _PyObject_CallNoArg(asyncio_get_event_loop);
 if (loop == NULL) {
 return NULL;
 }
@@ -2387,7 +2387,7 @@
 
 WITH_MOD("weakref")
 GET_MOD_ATTR(cls, "WeakSet")
- all_tasks = PyObject_CallObject(cls, NULL);
+ all_tasks = _PyObject_CallNoArg(cls);
 Py_CLEAR(cls);
 if (all_tasks == NULL) {
 goto fail;
diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c
--- a/Modules/_ctypes/_ctypes.c
+++ b/Modules/_ctypes/_ctypes.c
@@ -211,7 +211,7 @@
 PyObject *proxy;
 int result;
 
- obj = PyObject_CallObject((PyObject *)&DictRemover_Type, NULL);
+ obj = _PyObject_CallNoArg((PyObject *)&DictRemover_Type);
 if (obj == NULL)
 return -1;
 
@@ -373,7 +373,7 @@
 if (PyDict_GetItemString(result->tp_dict, "_abstract_"))
 return (PyObject *)result;
 
- dict = (StgDictObject *)PyObject_CallObject((PyObject *)&PyCStgDict_Type, NULL);
+ dict = (StgDictObject *)_PyObject_CallNoArg((PyObject *)&PyCStgDict_Type);
 if (!dict) {
 Py_DECREF(result);
 return NULL;
@@ -3654,10 +3654,10 @@
 goto error;
 }
 if (PyCArrayTypeObject_Check(ob))
- ob = PyObject_CallObject(ob, NULL);
+ ob = _PyObject_CallNoArg(ob);
 else
 /* Create an instance of the pointed-to type */
- ob = PyObject_CallObject(dict->proto, NULL);
+ ob = _PyObject_CallNoArg(dict->proto);
 /*
 XXX Is the following correct any longer?
 We must not pass a byref() to the array then but
diff --git a/Modules/_ctypes/stgdict.c b/Modules/_ctypes/stgdict.c
--- a/Modules/_ctypes/stgdict.c
+++ b/Modules/_ctypes/stgdict.c
@@ -228,7 +228,7 @@
 }
 continue;
 }
- new_descr = (CFieldObject *)PyObject_CallObject((PyObject *)&PyCField_Type, NULL);
+ new_descr = (CFieldObject *)_PyObject_CallNoArg((PyObject *)&PyCField_Type);
 if (new_descr == NULL) {
 Py_DECREF(fdescr);
 Py_DECREF(fieldlist);
diff --git a/Modules/_decimal/_decimal.c b/Modules/_decimal/_decimal.c
--- a/Modules/_decimal/_decimal.c
+++ b/Modules/_decimal/_decimal.c
@@ -1194,13 +1194,13 @@
 return NULL;
 }
 
- self->traps = PyObject_CallObject((PyObject *)PyDecSignalDict_Type, NULL);
+ self->traps = _PyObject_CallNoArg((PyObject *)PyDecSignalDict_Type);
 if (self->traps == NULL) {
 self->flags = NULL;
 Py_DECREF(self);
 return NULL;
 }
- self->flags = PyObject_CallObject((PyObject *)PyDecSignalDict_Type, NULL);
+ self->flags = _PyObject_CallNoArg((PyObject *)PyDecSignalDict_Type);
 if (self->flags == NULL) {
 Py_DECREF(self);
 return NULL;
@@ -1395,7 +1395,7 @@
 goto error;
 }
 
- context = PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL);
+ context = _PyObject_CallNoArg((PyObject *)&PyDecContext_Type);
 if (context == NULL) {
 return NULL;
 }
@@ -1417,7 +1417,7 @@
 {
 PyObject *copy;
 
- copy = PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL);
+ copy = _PyObject_CallNoArg((PyObject *)&PyDecContext_Type);
 if (copy == NULL) {
 return NULL;
 }
@@ -5835,7 +5835,7 @@
 
 /* Init default context template first */
 ASSIGN_PTR(default_context_template,
- PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL));
+ _PyObject_CallNoArg((PyObject *)&PyDecContext_Type));
 Py_INCREF(default_context_template);
 CHECK_INT(PyModule_AddObject(m, "DefaultContext",
 default_context_template));
@@ -5843,7 +5843,7 @@
 #ifdef WITHOUT_THREADS
 /* Init module context */
 ASSIGN_PTR(module_context,
- PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL));
+ _PyObject_CallNoArg((PyObject *)&PyDecContext_Type));
 Py_INCREF(Py_False);
 CHECK_INT(PyModule_AddObject(m, "HAVE_THREADS", Py_False));
 #else
@@ -5854,7 +5854,7 @@
 
 /* Init basic context template */
 ASSIGN_PTR(basic_context_template,
- PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL));
+ _PyObject_CallNoArg((PyObject *)&PyDecContext_Type));
 init_basic_context(basic_context_template);
 Py_INCREF(basic_context_template);
 CHECK_INT(PyModule_AddObject(m, "BasicContext",
@@ -5862,7 +5862,7 @@
 
 /* Init extended context template */
 ASSIGN_PTR(extended_context_template,
- PyObject_CallObject((PyObject *)&PyDecContext_Type, NULL));
+ _PyObject_CallNoArg((PyObject *)&PyDecContext_Type));
 init_extended_context(extended_context_template);
 Py_INCREF(extended_context_template);
 CHECK_INT(PyModule_AddObject(m, "ExtendedContext",
diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c
--- a/Modules/_functoolsmodule.c
+++ b/Modules/_functoolsmodule.c
@@ -1246,7 +1246,7 @@
 if (m == NULL)
 return NULL;
 
- kwd_mark = PyObject_CallObject((PyObject *)&PyBaseObject_Type, NULL);
+ kwd_mark = _PyObject_CallNoArg((PyObject *)&PyBaseObject_Type);
 if (!kwd_mark) {
 Py_DECREF(m);
 return NULL;
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -2277,7 +2277,7 @@
 {
 /* we assume the argument is callable object to which we own a reference */
 PyObject *callable = (PyObject *)arg;
- PyObject *r = PyObject_CallObject(callable, NULL);
+ PyObject *r = _PyObject_CallNoArg(callable);
 Py_DECREF(callable);
 Py_XDECREF(r);
 return r != NULL ? 0 : -1;
diff --git a/Modules/main.c b/Modules/main.c
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -157,7 +157,7 @@
 if (hook == NULL)
 PyErr_Clear();
 else {
- result = PyObject_CallObject(hook, NULL);
+ result = _PyObject_CallNoArg(hook);
 Py_DECREF(hook);
 if (result == NULL)
 goto error;
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1843,7 +1843,7 @@
 PyObject *d;
 int status;
 
- d = PyObject_CallObject(cls, NULL);
+ d = _PyObject_CallNoArg(cls);
 if (d == NULL)
 return NULL;
 
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -1856,7 +1856,7 @@
 PyObject *mro_meth = lookup_method((PyObject *)type, &PyId_mro);
 if (mro_meth == NULL)
 return NULL;
- mro_result = PyObject_CallObject(mro_meth, NULL);
+ mro_result = _PyObject_CallNoArg(mro_meth);
 Py_DECREF(mro_meth);
 }
 else {
@@ -4032,7 +4032,7 @@
 Py_DECREF(slotnames);
 }
 else { /* getstate != NULL */
- state = PyObject_CallObject(getstate, NULL);
+ state = _PyObject_CallNoArg(getstate);
 Py_DECREF(getstate);
 if (state == NULL)
 return NULL;
@@ -4057,7 +4057,7 @@
 __getnewargs_ex__ on the object. */
 getnewargs_ex = _PyObject_LookupSpecial(obj, &PyId___getnewargs_ex__);
 if (getnewargs_ex != NULL) {
- PyObject *newargs = PyObject_CallObject(getnewargs_ex, NULL);
+ PyObject *newargs = _PyObject_CallNoArg(getnewargs_ex);
 Py_DECREF(getnewargs_ex);
 if (newargs == NULL) {
 return -1;
@@ -4110,7 +4110,7 @@
 __getnewargs__ instead. */
 getnewargs = _PyObject_LookupSpecial(obj, &PyId___getnewargs__);
 if (getnewargs != NULL) {
- *args = PyObject_CallObject(getnewargs, NULL);
+ *args = _PyObject_CallNoArg(getnewargs);
 Py_DECREF(getnewargs);
 if (*args == NULL) {
 return -1;
@@ -4362,7 +4362,7 @@
 override = (clsreduce != objreduce);
 Py_DECREF(clsreduce);
 if (override) {
- res = PyObject_CallObject(reduce, NULL);
+ res = _PyObject_CallNoArg(reduce);
 Py_DECREF(reduce);
 return res;
 }
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -440,7 +440,7 @@
 }
 else
 {
- bufobj = PyObject_CallObject(tok->decoding_readline, NULL);
+ bufobj = _PyObject_CallNoArg(tok->decoding_readline);
 if (bufobj == NULL)
 goto error;
 }
@@ -533,7 +533,7 @@
 Py_XSETREF(tok->decoding_readline, readline);
 
 if (pos > 0) {
- PyObject *bufobj = PyObject_CallObject(readline, NULL);
+ PyObject *bufobj = _PyObject_CallNoArg(readline);
 if (bufobj == NULL)
 return 0;
 Py_DECREF(bufobj);
@@ -650,7 +650,7 @@
 } else {
 PyObject* buf = tok->decoding_buffer;
 if (buf == NULL) {
- buf = PyObject_CallObject(tok->decoding_readline, NULL);
+ buf = _PyObject_CallNoArg(tok->decoding_readline);
 if (buf == NULL) {
 error_ret(tok);
 return 1;
diff --git a/Python/ceval.c b/Python/ceval.c
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4198,7 +4198,7 @@
 
 if (PyExceptionClass_Check(exc)) {
 type = exc;
- value = PyObject_CallObject(exc, NULL);
+ value = _PyObject_CallNoArg(exc);
 if (value == NULL)
 goto raise_error;
 if (!PyExceptionInstance_Check(value)) {
@@ -4229,7 +4229,7 @@
 if (cause) {
 PyObject *fixed_cause;
 if (PyExceptionClass_Check(cause)) {
- fixed_cause = PyObject_CallObject(cause, NULL);
+ fixed_cause = _PyObject_CallNoArg(cause);
 if (fixed_cause == NULL)
 goto raise_error;
 Py_DECREF(cause);
-- 
Repository URL: https://hg.python.org/cpython

---

• Previous message (by thread): [Python-checkins] cpython: Use _PyObject_CallNoArg()
• Next message (by thread): [Python-checkins] cpython: Fix typo in a comment of abstract.c
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the Python-checkins mailing list