summaryrefslogtreecommitdiff
path: root/Include/ceval.h
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-12-06 16:27:24 +0100
committerVictor Stinner <victor.stinner@gmail.com>2016-12-06 16:27:24 +0100
commit2d0eb65f455ddd66f74ad01a8f4a44d271f2a3da (patch)
tree44ddb2baab8b1ca9e4ff117cb87a878bd4f07e4f /Include/ceval.h
parent89072047b86e90f415d4d7727733150b89f72b32 (diff)
downloadcpython-git-2d0eb65f455ddd66f74ad01a8f4a44d271f2a3da.tar.gz
Uniformize argument names of "call" functions
Issue #28838: Rename parameters of the "calls" functions of the Python C API. * Rename 'callable_object' and 'func' to 'callable': any Python callable object is accepted, not only Python functions * Rename 'method' and 'nameid' to 'name' (method name) * Rename 'o' to 'obj' * Move, fix and update documentation of PyObject_CallXXX() functions in abstract.h * Update also the documentaton of the C API (update parameter names)
Diffstat (limited to 'Include/ceval.h')
-rw-r--r--Include/ceval.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/Include/ceval.h b/Include/ceval.h
index 42229696ff..e4be595469 100644
--- a/Include/ceval.h
+++ b/Include/ceval.h
@@ -8,16 +8,18 @@ extern "C" {
/* Interface to random parts in ceval.c */
PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords(
- PyObject *func, PyObject *args, PyObject *kwargs);
+ PyObject *callable,
+ PyObject *args,
+ PyObject *kwargs);
/* Inline this */
-#define PyEval_CallObject(func,arg) \
- PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL)
+#define PyEval_CallObject(callable, arg) \
+ PyEval_CallObjectWithKeywords(callable, arg, (PyObject *)NULL)
-PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *obj,
+PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *callable,
const char *format, ...);
PyAPI_FUNC(PyObject *) PyEval_CallMethod(PyObject *obj,
- const char *methodname,
+ const char *name,
const char *format, ...);
#ifndef Py_LIMITED_API