[Python-checkins] cpython: Backed out changeset b9c9691c72c5

victor.stinner python-checkins at python.org
Sun Dec 4 17:00:14 EST 2016

• Previous message (by thread): [Python-checkins] cpython (merge 3.6 -> default): merge
• Next message (by thread): [Python-checkins] cpython (3.6): Issue #23722: improve __classcell__ compatibility
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

https://hg.python.org/cpython/rev/d35fc6e58a70
changeset: 105458:d35fc6e58a70
user: Victor Stinner <victor.stinner at gmail.com>
date: Sun Dec 04 22:59:09 2016 +0100
summary:
 Backed out changeset b9c9691c72c5
Issue #28858: The change b9c9691c72c5 introduced a regression. It seems like
_PyObject_CallArg1() uses more stack memory than
PyObject_CallFunctionObjArgs().
files:
 Modules/_asynciomodule.c | 12 +++++++-----
 Modules/_csv.c | 2 +-
 Modules/_elementtree.c | 2 +-
 Modules/_json.c | 12 ++++++------
 Modules/_ssl.c | 2 +-
 Modules/_struct.c | 2 +-
 Modules/_testbuffer.c | 10 +++++-----
 Modules/gcmodule.c | 2 +-
 Modules/itertoolsmodule.c | 10 +++++-----
 Modules/mathmodule.c | 6 +++---
 Modules/posixmodule.c | 4 ++--
 Objects/abstract.c | 8 ++++----
 Objects/bytearrayobject.c | 6 ++++--
 Objects/bytesobject.c | 7 ++++---
 Objects/complexobject.c | 2 +-
 Objects/descrobject.c | 2 +-
 Objects/dictobject.c | 3 ++-
 Objects/enumobject.c | 2 +-
 Objects/floatobject.c | 2 +-
 Objects/genobject.c | 4 ++--
 Objects/listobject.c | 3 ++-
 Objects/longobject.c | 3 ++-
 Objects/memoryobject.c | 4 ++--
 Objects/object.c | 4 ++--
 Objects/odictobject.c | 2 +-
 Objects/typeobject.c | 6 ++++--
 Objects/unicodeobject.c | 10 ++++++----
 Objects/weakrefobject.c | 2 +-
 Python/_warnings.c | 2 +-
 Python/bltinmodule.c | 8 ++++----
 Python/ceval.c | 6 +++---
 Python/import.c | 2 +-
 Python/sysmodule.c | 2 +-
 33 files changed, 83 insertions(+), 71 deletions(-)
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
--- a/Modules/_asynciomodule.c
+++ b/Modules/_asynciomodule.c
@@ -721,7 +721,8 @@
 _asyncio_Future__repr_info_impl(FutureObj *self)
 /*[clinic end generated code: output=fa69e901bd176cfb input=f21504d8e2ae1ca2]*/
 {
- return _PyObject_CallArg1(asyncio_future_repr_info_func, self);
+ return PyObject_CallFunctionObjArgs(
+ asyncio_future_repr_info_func, self, NULL);
 }
 
 /*[clinic input]
@@ -1536,7 +1537,8 @@
 _asyncio_Task__repr_info_impl(TaskObj *self)
 /*[clinic end generated code: output=6a490eb66d5ba34b input=3c6d051ed3ddec8b]*/
 {
- return _PyObject_CallArg1(asyncio_task_repr_info_func, self);
+ return PyObject_CallFunctionObjArgs(
+ asyncio_task_repr_info_func, self, NULL);
 }
 
 /*[clinic input]
@@ -1896,7 +1898,7 @@
 return NULL;
 }
 
- PyObject *e = _PyObject_CallArg1(et, msg);
+ PyObject *e = PyObject_CallFunctionObjArgs(et, msg, NULL);
 Py_DECREF(msg);
 if (e == NULL) {
 return NULL;
@@ -1946,7 +1948,7 @@
 
 if (!exc) {
 /* exc was not a CancelledError */
- exc = _PyObject_CallNoArg(asyncio_CancelledError);
+ exc = PyObject_CallFunctionObjArgs(asyncio_CancelledError, NULL);
 if (!exc) {
 goto fail;
 }
@@ -2179,7 +2181,7 @@
 }
 
 /* Check if `result` is a generator */
- o = _PyObject_CallArg1(inspect_isgenerator, result);
+ o = PyObject_CallFunctionObjArgs(inspect_isgenerator, result, NULL);
 if (o == NULL) {
 /* An exception in inspect.isgenerator */
 goto fail;
diff --git a/Modules/_csv.c b/Modules/_csv.c
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -1259,7 +1259,7 @@
 (void *) self->rec, self->rec_len);
 if (line == NULL)
 return NULL;
- result = _PyObject_CallArg1(self->writeline, line);
+ result = PyObject_CallFunctionObjArgs(self->writeline, line, NULL);
 Py_DECREF(line);
 return result;
 }
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -2457,7 +2457,7 @@
 PyObject *event = PyTuple_Pack(2, action, node);
 if (event == NULL)
 return -1;
- res = _PyObject_CallArg1(self->events_append, event);
+ res = PyObject_CallFunctionObjArgs(self->events_append, event, NULL);
 Py_DECREF(event);
 if (res == NULL)
 return -1;
diff --git a/Modules/_json.c b/Modules/_json.c
--- a/Modules/_json.c
+++ b/Modules/_json.c
@@ -813,14 +813,14 @@
 *next_idx_ptr = idx + 1;
 
 if (has_pairs_hook) {
- val = _PyObject_CallArg1(s->object_pairs_hook, rval);
+ val = PyObject_CallFunctionObjArgs(s->object_pairs_hook, rval, NULL);
 Py_DECREF(rval);
 return val;
 }
 
 /* if object_hook is not None: rval = object_hook(rval) */
 if (s->object_hook != Py_None) {
- val = _PyObject_CallArg1(s->object_hook, rval);
+ val = PyObject_CallFunctionObjArgs(s->object_hook, rval, NULL);
 Py_DECREF(rval);
 return val;
 }
@@ -924,7 +924,7 @@
 return NULL;
 
 /* rval = parse_constant(constant) */
- rval = _PyObject_CallArg1(s->parse_constant, cstr);
+ rval = PyObject_CallFunctionObjArgs(s->parse_constant, cstr, NULL);
 idx += PyUnicode_GET_LENGTH(cstr);
 Py_DECREF(cstr);
 *next_idx_ptr = idx;
@@ -1023,7 +1023,7 @@
 idx - start);
 if (numstr == NULL)
 return NULL;
- rval = _PyObject_CallArg1(custom_func, numstr);
+ rval = PyObject_CallFunctionObjArgs(custom_func, numstr, NULL);
 }
 else {
 Py_ssize_t i, n;
@@ -1475,7 +1475,7 @@
 if (s->fast_encode)
 return s->fast_encode(NULL, obj);
 else
- return _PyObject_CallArg1(s->encoder, obj);
+ return PyObject_CallFunctionObjArgs(s->encoder, obj, NULL);
 }
 
 static int
@@ -1553,7 +1553,7 @@
 return -1;
 }
 }
- newobj = _PyObject_CallArg1(s->defaultfn, obj);
+ newobj = PyObject_CallFunctionObjArgs(s->defaultfn, obj, NULL);
 if (newobj == NULL) {
 Py_XDECREF(ident);
 return -1;
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -3197,7 +3197,7 @@
 PySSL_END_ALLOW_THREADS_S(pw_info->thread_state);
 
 if (pw_info->callable) {
- fn_ret = _PyObject_CallNoArg(pw_info->callable);
+ fn_ret = PyObject_CallFunctionObjArgs(pw_info->callable, NULL);
 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/_struct.c b/Modules/_struct.c
--- a/Modules/_struct.c
+++ b/Modules/_struct.c
@@ -2046,7 +2046,7 @@
 return s_object;
 }
 
- s_object = _PyObject_CallArg1((PyObject *)(&PyStructType), fmt);
+ s_object = PyObject_CallFunctionObjArgs((PyObject *)(&PyStructType), fmt, NULL);
 if (s_object != NULL) {
 if (PyDict_Size(cache) >= MAXCACHE)
 PyDict_Clear(cache);
diff --git a/Modules/_testbuffer.c b/Modules/_testbuffer.c
--- a/Modules/_testbuffer.c
+++ b/Modules/_testbuffer.c
@@ -312,7 +312,7 @@
 assert(PyObject_CheckBuffer(obj));
 assert(PyList_Check(items) || PyTuple_Check(items));
 
- structobj = _PyObject_CallArg1(Struct, format);
+ structobj = PyObject_CallFunctionObjArgs(Struct, format, NULL);
 if (structobj == NULL)
 return -1;
 
@@ -406,7 +406,7 @@
 if (format == NULL)
 goto out;
 
- structobj = _PyObject_CallArg1(Struct, format);
+ structobj = PyObject_CallFunctionObjArgs(Struct, format, NULL);
 if (structobj == NULL)
 goto out;
 
@@ -620,7 +620,7 @@
 
 if (ndim == 0) {
 memcpy(item, ptr, itemsize);
- x = _PyObject_CallArg1(unpack_from, mview);
+ x = PyObject_CallFunctionObjArgs(unpack_from, mview, NULL);
 if (x == NULL)
 return NULL;
 if (PyTuple_GET_SIZE(x) == 1) {
@@ -696,7 +696,7 @@
 if (format == NULL)
 goto out;
 
- structobj = _PyObject_CallArg1(Struct, format);
+ structobj = PyObject_CallFunctionObjArgs(Struct, format, NULL);
 Py_DECREF(format);
 if (structobj == NULL)
 goto out;
@@ -788,7 +788,7 @@
 PyObject *tmp;
 Py_ssize_t itemsize;
 
- tmp = _PyObject_CallArg1(calcsize, format);
+ tmp = PyObject_CallFunctionObjArgs(calcsize, format, NULL);
 if (tmp == NULL)
 return -1;
 itemsize = PyLong_AsSsize_t(tmp);
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
--- a/Modules/gcmodule.c
+++ b/Modules/gcmodule.c
@@ -709,7 +709,7 @@
 assert(callback != NULL);
 
 /* copy-paste of weakrefobject.c's handle_callback() */
- temp = _PyObject_CallArg1(callback, wr);
+ temp = PyObject_CallFunctionObjArgs(callback, wr, NULL);
 if (temp == NULL)
 PyErr_WriteUnraisable(callback);
 else
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c
--- a/Modules/itertoolsmodule.c
+++ b/Modules/itertoolsmodule.c
@@ -101,7 +101,7 @@
 newkey = newvalue;
 Py_INCREF(newvalue);
 } else {
- newkey = _PyObject_CallArg1(gbo->keyfunc, newvalue);
+ newkey = PyObject_CallFunctionObjArgs(gbo->keyfunc, newvalue, NULL);
 if (newkey == NULL) {
 Py_DECREF(newvalue);
 return NULL;
@@ -293,7 +293,7 @@
 newkey = newvalue;
 Py_INCREF(newvalue);
 } else {
- newkey = _PyObject_CallArg1(gbo->keyfunc, newvalue);
+ newkey = PyObject_CallFunctionObjArgs(gbo->keyfunc, newvalue, NULL);
 if (newkey == NULL) {
 Py_DECREF(newvalue);
 return NULL;
@@ -1130,7 +1130,7 @@
 if (lz->start == 1)
 return item;
 
- good = _PyObject_CallArg1(lz->func, item);
+ good = PyObject_CallFunctionObjArgs(lz->func, item, NULL);
 if (good == NULL) {
 Py_DECREF(item);
 return NULL;
@@ -1296,7 +1296,7 @@
 if (item == NULL)
 return NULL;
 
- good = _PyObject_CallArg1(lz->func, item);
+ good = PyObject_CallFunctionObjArgs(lz->func, item, NULL);
 if (good == NULL) {
 Py_DECREF(item);
 return NULL;
@@ -3824,7 +3824,7 @@
 ok = PyObject_IsTrue(item);
 } else {
 PyObject *good;
- good = _PyObject_CallArg1(lz->func, item);
+ good = PyObject_CallFunctionObjArgs(lz->func, item, NULL);
 if (good == NULL) {
 Py_DECREF(item);
 return NULL;
diff --git a/Modules/mathmodule.c b/Modules/mathmodule.c
--- a/Modules/mathmodule.c
+++ b/Modules/mathmodule.c
@@ -951,7 +951,7 @@
 return NULL;
 return math_1_to_int(number, ceil, 0);
 }
- result = _PyObject_CallNoArg(method);
+ result = PyObject_CallFunctionObjArgs(method, NULL);
 Py_DECREF(method);
 return result;
 }
@@ -991,7 +991,7 @@
 return NULL;
 return math_1_to_int(number, floor, 0);
 }
- result = _PyObject_CallNoArg(method);
+ result = PyObject_CallFunctionObjArgs(method, NULL);
 Py_DECREF(method);
 return result;
 }
@@ -1542,7 +1542,7 @@
 Py_TYPE(number)->tp_name);
 return NULL;
 }
- result = _PyObject_CallNoArg(trunc);
+ result = PyObject_CallFunctionObjArgs(trunc, NULL);
 Py_DECREF(trunc);
 return result;
 }
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -902,7 +902,7 @@
 goto error_exit;
 }
 
- o = to_cleanup = _PyObject_CallNoArg(func);
+ o = to_cleanup = PyObject_CallFunctionObjArgs(func, NULL);
 Py_DECREF(func);
 if (NULL == o) {
 goto error_exit;
@@ -12041,7 +12041,7 @@
 Py_TYPE(path)->tp_name);
 }
 
- path_repr = _PyObject_CallNoArg(func);
+ path_repr = PyObject_CallFunctionObjArgs(func, NULL);
 Py_DECREF(func);
 if (NULL == path_repr) {
 return NULL;
diff --git a/Objects/abstract.c b/Objects/abstract.c
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -103,7 +103,7 @@
 }
 return defaultvalue;
 }
- result = _PyObject_CallNoArg(hint);
+ result = PyObject_CallFunctionObjArgs(hint, NULL);
 Py_DECREF(hint);
 if (result == NULL) {
 if (PyErr_ExceptionMatches(PyExc_TypeError)) {
@@ -716,7 +716,7 @@
 }
 
 /* And call it. */
- result = _PyObject_CallArg1(meth, format_spec);
+ result = PyObject_CallFunctionObjArgs(meth, format_spec, NULL);
 Py_DECREF(meth);
 
 if (result && !PyUnicode_Check(result)) {
@@ -3011,7 +3011,7 @@
 Py_DECREF(checker);
 return ok;
 }
- res = _PyObject_CallArg1(checker, inst);
+ res = PyObject_CallFunctionObjArgs(checker, inst, NULL);
 Py_LeaveRecursiveCall();
 Py_DECREF(checker);
 if (res != NULL) {
@@ -3085,7 +3085,7 @@
 Py_DECREF(checker);
 return ok;
 }
- res = _PyObject_CallArg1(checker, derived);
+ res = PyObject_CallFunctionObjArgs(checker, derived, NULL);
 Py_LeaveRecursiveCall();
 Py_DECREF(checker);
 if (res != NULL) {
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c
--- a/Objects/bytearrayobject.c
+++ b/Objects/bytearrayobject.c
@@ -98,7 +98,8 @@
 PyObject *
 PyByteArray_FromObject(PyObject *input)
 {
- return _PyObject_CallArg1((PyObject *)&PyByteArray_Type, input);
+ return PyObject_CallFunctionObjArgs((PyObject *)&PyByteArray_Type,
+ input, NULL);
 }
 
 PyObject *
@@ -1984,7 +1985,8 @@
 {
 PyObject *result = _PyBytes_FromHex(string, type == &PyByteArray_Type);
 if (type != &PyByteArray_Type && result != NULL) {
- Py_SETREF(result, _PyObject_CallArg1((PyObject *)type, result));
+ Py_SETREF(result, PyObject_CallFunctionObjArgs((PyObject *)type,
+ result, NULL));
 }
 return result;
 }
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
--- a/Objects/bytesobject.c
+++ b/Objects/bytesobject.c
@@ -549,7 +549,7 @@
 /* does it support __bytes__? */
 func = _PyObject_LookupSpecial(v, &PyId___bytes__);
 if (func != NULL) {
- result = _PyObject_CallNoArg(func);
+ result = PyObject_CallFunctionObjArgs(func, NULL);
 Py_DECREF(func);
 if (result == NULL)
 return NULL;
@@ -2331,7 +2331,8 @@
 {
 PyObject *result = _PyBytes_FromHex(string, 0);
 if (type != &PyBytes_Type && result != NULL) {
- Py_SETREF(result, _PyObject_CallArg1((PyObject *)type, result));
+ Py_SETREF(result, PyObject_CallFunctionObjArgs((PyObject *)type,
+ result, NULL));
 }
 return result;
 }
@@ -2568,7 +2569,7 @@
 PyObject_Bytes doesn't do. */
 func = _PyObject_LookupSpecial(x, &PyId___bytes__);
 if (func != NULL) {
- new = _PyObject_CallNoArg(func);
+ new = PyObject_CallFunctionObjArgs(func, NULL);
 Py_DECREF(func);
 if (new == NULL)
 return NULL;
diff --git a/Objects/complexobject.c b/Objects/complexobject.c
--- a/Objects/complexobject.c
+++ b/Objects/complexobject.c
@@ -273,7 +273,7 @@
 
 f = _PyObject_LookupSpecial(op, &PyId___complex__);
 if (f) {
- PyObject *res = _PyObject_CallNoArg(f);
+ PyObject *res = PyObject_CallFunctionObjArgs(f, NULL);
 Py_DECREF(f);
 if (res != NULL && !PyComplex_Check(res)) {
 PyErr_SetString(PyExc_TypeError,
diff --git a/Objects/descrobject.c b/Objects/descrobject.c
--- a/Objects/descrobject.c
+++ b/Objects/descrobject.c
@@ -1414,7 +1414,7 @@
 return -1;
 }
 if (value == NULL)
- res = _PyObject_CallArg1(func, obj);
+ res = PyObject_CallFunctionObjArgs(func, obj, NULL);
 else
 res = PyObject_CallFunctionObjArgs(func, obj, value, NULL);
 if (res == NULL)
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -2066,7 +2066,8 @@
 _Py_IDENTIFIER(__missing__);
 missing = _PyObject_LookupSpecial((PyObject *)mp, &PyId___missing__);
 if (missing != NULL) {
- res = _PyObject_CallArg1(missing, key);
+ res = PyObject_CallFunctionObjArgs(missing,
+ key, NULL);
 Py_DECREF(missing);
 return res;
 }
diff --git a/Objects/enumobject.c b/Objects/enumobject.c
--- a/Objects/enumobject.c
+++ b/Objects/enumobject.c
@@ -258,7 +258,7 @@
 return NULL;
 }
 if (reversed_meth != NULL) {
- PyObject *res = _PyObject_CallNoArg(reversed_meth);
+ PyObject *res = PyObject_CallFunctionObjArgs(reversed_meth, NULL);
 Py_DECREF(reversed_meth);
 return res;
 }
diff --git a/Objects/floatobject.c b/Objects/floatobject.c
--- a/Objects/floatobject.c
+++ b/Objects/floatobject.c
@@ -1439,7 +1439,7 @@
 goto parse_error;
 result = PyFloat_FromDouble(negate ? -x : x);
 if (cls != (PyObject *)&PyFloat_Type && result != NULL) {
- Py_SETREF(result, _PyObject_CallArg1(cls, result));
+ Py_SETREF(result, PyObject_CallFunctionObjArgs(cls, result, NULL));
 }
 return result;
 
diff --git a/Objects/genobject.c b/Objects/genobject.c
--- a/Objects/genobject.c
+++ b/Objects/genobject.c
@@ -43,7 +43,7 @@
 /* Save the current exception, if any. */
 PyErr_Fetch(&error_type, &error_value, &error_traceback);
 
- res = _PyObject_CallArg1(finalizer, self);
+ res = PyObject_CallFunctionObjArgs(finalizer, self, NULL);
 
 if (res == NULL) {
 PyErr_WriteUnraisable(self);
@@ -591,7 +591,7 @@
 *
 * (See PyErr_SetObject/_PyErr_CreateException code for details.)
 */
- e = _PyObject_CallArg1(PyExc_StopIteration, value);
+ e = PyObject_CallFunctionObjArgs(PyExc_StopIteration, value, NULL);
 if (e == NULL) {
 return -1;
 }
diff --git a/Objects/listobject.c b/Objects/listobject.c
--- a/Objects/listobject.c
+++ b/Objects/listobject.c
@@ -1970,7 +1970,8 @@
 }
 
 for (i = 0; i < saved_ob_size ; i++) {
- keys[i] = _PyObject_CallArg1(keyfunc, saved_ob_item[i]);
+ keys[i] = PyObject_CallFunctionObjArgs(keyfunc, saved_ob_item[i],
+ NULL);
 if (keys[i] == NULL) {
 for (i=i-1 ; i>=0 ; i--)
 Py_DECREF(keys[i]);
diff --git a/Objects/longobject.c b/Objects/longobject.c
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -5282,7 +5282,8 @@
 Py_DECREF(bytes);
 
 if (type != &PyLong_Type) {
- Py_SETREF(long_obj, _PyObject_CallArg1((PyObject *)type, long_obj));
+ Py_SETREF(long_obj, PyObject_CallFunctionObjArgs((PyObject *)type,
+ long_obj, NULL));
 }
 
 return long_obj;
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
--- a/Objects/memoryobject.c
+++ b/Objects/memoryobject.c
@@ -1939,7 +1939,7 @@
 if (format == NULL)
 goto error;
 
- structobj = _PyObject_CallArg1(Struct, format);
+ structobj = PyObject_CallFunctionObjArgs(Struct, format, NULL);
 if (structobj == NULL)
 goto error;
 
@@ -1978,7 +1978,7 @@
 PyObject *v;
 
 memcpy(x->item, ptr, x->itemsize);
- v = _PyObject_CallArg1(x->unpack_from, x->mview);
+ v = PyObject_CallFunctionObjArgs(x->unpack_from, x->mview, NULL);
 if (v == NULL)
 return NULL;
 
diff --git a/Objects/object.c b/Objects/object.c
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -596,7 +596,7 @@
 
 func = _PyObject_LookupSpecial(v, &PyId___bytes__);
 if (func != NULL) {
- result = _PyObject_CallNoArg(func);
+ result = PyObject_CallFunctionObjArgs(func, NULL);
 Py_DECREF(func);
 if (result == NULL)
 return NULL;
@@ -1314,7 +1314,7 @@
 return NULL;
 }
 /* use __dir__ */
- result = _PyObject_CallNoArg(dirfunc);
+ result = PyObject_CallFunctionObjArgs(dirfunc, NULL);
 Py_DECREF(dirfunc);
 if (result == NULL)
 return NULL;
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
--- a/Objects/odictobject.c
+++ b/Objects/odictobject.c
@@ -1256,7 +1256,7 @@
 if (PyODict_CheckExact(od))
 od_copy = PyODict_New();
 else
- od_copy = _PyObject_CallNoArg((PyObject *)Py_TYPE(od));
+ od_copy = PyObject_CallFunctionObjArgs((PyObject *)Py_TYPE(od), NULL);
 if (od_copy == NULL)
 return NULL;
 
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3487,7 +3487,9 @@
 sorted = _PyDict_GetItemId(builtins, &PyId_sorted);
 if (sorted == NULL)
 goto error;
- sorted_methods = _PyObject_CallArg1(sorted, abstract_methods);
+ sorted_methods = PyObject_CallFunctionObjArgs(sorted,
+ abstract_methods,
+ NULL);
 if (sorted_methods == NULL)
 goto error;
 comma = _PyUnicode_FromId(&comma_id);
@@ -6191,7 +6193,7 @@
 else
 attr = descr;
 }
- res = _PyObject_CallArg1(attr, name);
+ res = PyObject_CallFunctionObjArgs(attr, name, NULL);
 Py_XDECREF(descr);
 return res;
 }
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4269,7 +4269,7 @@
 if (*exceptionObject == NULL)
 goto onError;
 
- restuple = _PyObject_CallArg1(*errorHandler, *exceptionObject);
+ restuple = PyObject_CallFunctionObjArgs(*errorHandler, *exceptionObject, NULL);
 if (restuple == NULL)
 goto onError;
 if (!PyTuple_Check(restuple)) {
@@ -4368,7 +4368,7 @@
 if (*exceptionObject == NULL)
 goto onError;
 
- restuple = _PyObject_CallArg1(*errorHandler, *exceptionObject);
+ restuple = PyObject_CallFunctionObjArgs(*errorHandler, *exceptionObject, NULL);
 if (restuple == NULL)
 goto onError;
 if (!PyTuple_Check(restuple)) {
@@ -6649,7 +6649,8 @@
 if (*exceptionObject == NULL)
 return NULL;
 
- restuple = _PyObject_CallArg1(*errorHandler, *exceptionObject);
+ restuple = PyObject_CallFunctionObjArgs(
+ *errorHandler, *exceptionObject, NULL);
 if (restuple == NULL)
 return NULL;
 if (!PyTuple_Check(restuple)) {
@@ -8643,7 +8644,8 @@
 if (*exceptionObject == NULL)
 return NULL;
 
- restuple = _PyObject_CallArg1(*errorHandler, *exceptionObject);
+ restuple = PyObject_CallFunctionObjArgs(
+ *errorHandler, *exceptionObject, NULL);
 if (restuple == NULL)
 return NULL;
 if (!PyTuple_Check(restuple)) {
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -867,7 +867,7 @@
 static void
 handle_callback(PyWeakReference *ref, PyObject *callback)
 {
- PyObject *cbresult = _PyObject_CallArg1(callback, ref);
+ PyObject *cbresult = PyObject_CallFunctionObjArgs(callback, ref, NULL);
 
 if (cbresult == NULL)
 PyErr_WriteUnraisable(callback);
diff --git a/Python/_warnings.c b/Python/_warnings.c
--- a/Python/_warnings.c
+++ b/Python/_warnings.c
@@ -415,7 +415,7 @@
 if (msg == NULL)
 goto error;
 
- res = _PyObject_CallArg1(show_fn, msg);
+ res = PyObject_CallFunctionObjArgs(show_fn, msg, NULL);
 Py_DECREF(show_fn);
 Py_DECREF(msg);
 
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -469,7 +469,7 @@
 ok = PyObject_IsTrue(item);
 } else {
 PyObject *good;
- good = _PyObject_CallArg1(lz->func, item);
+ good = PyObject_CallFunctionObjArgs(lz->func, item, NULL);
 if (good == NULL) {
 Py_DECREF(item);
 return NULL;
@@ -1519,7 +1519,7 @@
 while (( item = PyIter_Next(it) )) {
 /* get the value from the key function */
 if (keyfunc != NULL) {
- val = _PyObject_CallArg1(keyfunc, item);
+ val = PyObject_CallFunctionObjArgs(keyfunc, item, NULL);
 if (val == NULL)
 goto Fail_it_item;
 }
@@ -2044,9 +2044,9 @@
 }
 
 if (ndigits == NULL || ndigits == Py_None)
- result = _PyObject_CallNoArg(round);
+ result = PyObject_CallFunctionObjArgs(round, NULL);
 else
- result = _PyObject_CallArg1(round, ndigits);
+ result = PyObject_CallFunctionObjArgs(round, ndigits, NULL);
 Py_DECREF(round);
 return result;
 }
diff --git a/Python/ceval.c b/Python/ceval.c
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1756,7 +1756,7 @@
 Py_DECREF(value);
 goto error;
 }
- res = _PyObject_CallArg1(hook, value);
+ res = PyObject_CallFunctionObjArgs(hook, value, NULL);
 Py_DECREF(value);
 if (res == NULL)
 goto error;
@@ -3062,7 +3062,7 @@
 Py_DECREF(mgr);
 if (enter == NULL)
 goto error;
- res = _PyObject_CallNoArg(enter);
+ res = PyObject_CallFunctionObjArgs(enter, NULL);
 Py_DECREF(enter);
 if (res == NULL)
 goto error;
@@ -3096,7 +3096,7 @@
 }
 SET_TOP(exit);
 Py_DECREF(mgr);
- res = _PyObject_CallNoArg(enter);
+ res = PyObject_CallFunctionObjArgs(enter, NULL);
 Py_DECREF(enter);
 if (res == NULL)
 goto error;
diff --git a/Python/import.c b/Python/import.c
--- a/Python/import.c
+++ b/Python/import.c
@@ -985,7 +985,7 @@
 PyObject *hook = PyList_GetItem(path_hooks, j);
 if (hook == NULL)
 return NULL;
- importer = _PyObject_CallArg1(hook, p);
+ importer = PyObject_CallFunctionObjArgs(hook, p, NULL);
 if (importer != NULL)
 break;
 
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1098,7 +1098,7 @@
 Py_TYPE(o)->tp_name);
 }
 else {
- res = _PyObject_CallNoArg(method);
+ res = PyObject_CallFunctionObjArgs(method, NULL);
 Py_DECREF(method);
 }
 
-- 
Repository URL: https://hg.python.org/cpython

---

• Previous message (by thread): [Python-checkins] cpython (merge 3.6 -> default): merge
• Next message (by thread): [Python-checkins] cpython (3.6): Issue #23722: improve __classcell__ compatibility
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the Python-checkins mailing list