[Python-checkins] bpo-29548: no longer use PyEval_Call* functions (GH-14683)
Inada Naoki
webhook-mailer at python.org
Thu Jul 11 11:58:01 EDT 2019
https://github.com/python/cpython/commit/1dbd084f1f68d7293718b663df675cfbd0c65712
commit: 1dbd084f1f68d7293718b663df675cfbd0c65712
branch: master
author: Jeroen Demeyer <J.Demeyer at UGent.be>
committer: Inada Naoki <songofacandy at gmail.com>
date: 2019-07-12T00:57:32+09:00
summary:
bpo-29548: no longer use PyEval_Call* functions (GH-14683)
files:
M Modules/pyexpat.c
M Modules/signalmodule.c
M Objects/call.c
M Python/codecs.c
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 3d193e717c88..b0096e664780 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -208,7 +208,7 @@ call_with_frame(const char *funcname, int lineno, PyObject* func, PyObject* args
{
PyObject *res;
- res = PyEval_CallObject(func, args);
+ res = PyObject_Call(func, args, NULL);
if (res == NULL) {
_PyTraceback_Add(funcname, __FILE__, lineno);
XML_StopParser(self->itself, XML_FALSE);
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index 7698984ff3af..95569b931d60 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -1667,8 +1667,7 @@ _PyErr_CheckSignals(void)
_Py_atomic_store_relaxed(&Handlers[i].tripped, 0);
if (arglist) {
- result = PyEval_CallObject(Handlers[i].func,
- arglist);
+ result = PyObject_Call(Handlers[i].func, arglist, NULL);
Py_DECREF(arglist);
}
if (!result) {
diff --git a/Objects/call.c b/Objects/call.c
index df90595d6c6a..7d917891bc0c 100644
--- a/Objects/call.c
+++ b/Objects/call.c
@@ -457,7 +457,16 @@ PyEval_CallObjectWithKeywords(PyObject *callable,
PyObject *
PyObject_CallObject(PyObject *callable, PyObject *args)
{
- return PyEval_CallObjectWithKeywords(callable, args, NULL);
+ assert(!PyErr_Occurred());
+ if (args == NULL) {
+ return _PyObject_CallNoArg(callable);
+ }
+ if (!PyTuple_Check(args)) {
+ PyErr_SetString(PyExc_TypeError,
+ "argument list must be a tuple");
+ return NULL;
+ }
+ return PyObject_Call(callable, args, NULL);
}
diff --git a/Python/codecs.c b/Python/codecs.c
index 75b60ec6bd77..4f38b33e0b76 100644
--- a/Python/codecs.c
+++ b/Python/codecs.c
@@ -416,7 +416,7 @@ _PyCodec_EncodeInternal(PyObject *object,
if (args == NULL)
goto onError;
- result = PyEval_CallObject(encoder, args);
+ result = PyObject_Call(encoder, args, NULL);
if (result == NULL) {
wrap_codec_error("encoding", encoding);
goto onError;
@@ -462,7 +462,7 @@ _PyCodec_DecodeInternal(PyObject *object,
if (args == NULL)
goto onError;
- result = PyEval_CallObject(decoder,args);
+ result = PyObject_Call(decoder, args, NULL);
if (result == NULL) {
wrap_codec_error("decoding", encoding);
goto onError;
More information about the Python-checkins
mailing list