summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-08-22 20:48:54 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-08-22 20:48:54 (GMT)
commit559bb6a71399af3b1b2a0ba97230d2bcc649e993 (patch)
tree94927374ac025ae249aa487ce4a17df99c3df2d8 /Python
parentc98afb7a26ac611a4544c5b8dd445d8ea05e6360 (diff)
downloadcpython-559bb6a71399af3b1b2a0ba97230d2bcc649e993.zip
cpython-559bb6a71399af3b1b2a0ba97230d2bcc649e993.tar.gz
cpython-559bb6a71399af3b1b2a0ba97230d2bcc649e993.tar.bz2
Rename _PyObject_FastCall() to _PyObject_FastCallDict()
Issue #27809: * Rename _PyObject_FastCall() function to _PyObject_FastCallDict() * Add _PyObject_FastCall(), _PyObject_CallNoArg() and _PyObject_CallArg1() macros calling _PyObject_FastCallDict()
Diffstat (limited to 'Python')
-rw-r--r--Python/ceval.c4
-rw-r--r--Python/pythonrun.c2
-rw-r--r--Python/sysmodule.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/Python/ceval.c b/Python/ceval.c
index bd0cbe7..96380bc 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -4593,7 +4593,7 @@ PyEval_CallObjectWithKeywords(PyObject *func, PyObject *args, PyObject *kwargs)
if (args == NULL) {
if (kwargs == NULL) {
- return _PyObject_FastCall(func, NULL, 0, 0);
+ return _PyObject_CallNoArg(func);
}
args = PyTuple_New(0);
@@ -5298,7 +5298,7 @@ import_name(PyFrameObject *f, PyObject *name, PyObject *fromlist, PyObject *leve
stack[2] = f->f_locals == NULL ? Py_None : f->f_locals;
stack[3] = fromlist;
stack[4] = level;
- res = _PyObject_FastCall(import_func, stack, 5, NULL);
+ res = _PyObject_FastCall(import_func, stack, 5);
Py_DECREF(import_func);
return res;
}
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 2968b34..3fb6f15 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -636,7 +636,7 @@ PyErr_PrintEx(int set_sys_last_vars)
stack[0] = exception;
stack[1] = v;
stack[2] = tb;
- result = _PyObject_FastCall(hook, stack, 3, NULL);
+ result = _PyObject_FastCall(hook, stack, 3);
if (result == NULL) {
PyObject *exception2, *v2, *tb2;
if (PyErr_ExceptionMatches(PyExc_SystemExit)) {
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index be8e164..c170bd5 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -380,7 +380,7 @@ call_trampoline(PyObject* callback,
stack[2] = (arg != NULL) ? arg : Py_None;
/* call the Python-level function */
- result = _PyObject_FastCall(callback, stack, 3, NULL);
+ result = _PyObject_FastCall(callback, stack, 3);
PyFrame_LocalsToFast(frame, 1);
if (result == NULL) {
@@ -2122,7 +2122,7 @@ sys_pyfile_write_unicode(PyObject *unicode, PyObject *file)
if (writer == NULL)
goto error;
- result = _PyObject_FastCall(writer, &unicode, 1, NULL);
+ result = _PyObject_CallArg1(writer, unicode);
if (result == NULL) {
goto error;
} else {