diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2016-12-06 16:27:24 +0100 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2016-12-06 16:27:24 +0100 |
commit | 2d0eb65f455ddd66f74ad01a8f4a44d271f2a3da (patch) | |
tree | 44ddb2baab8b1ca9e4ff117cb87a878bd4f07e4f /Python/modsupport.c | |
parent | Fixed misplaced comment. (diff) | |
download | cpython-2d0eb65f455ddd66f74ad01a8f4a44d271f2a3da.tar.gz cpython-2d0eb65f455ddd66f74ad01a8f4a44d271f2a3da.tar.bz2 cpython-2d0eb65f455ddd66f74ad01a8f4a44d271f2a3da.zip |
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 'Python/modsupport.c')
-rw-r--r-- | Python/modsupport.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Python/modsupport.c b/Python/modsupport.c index 06bdcab3c6c..3ae3fea034b 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c @@ -487,7 +487,7 @@ va_build_value(const char *format, va_list va, int flags) PyObject * -PyEval_CallFunction(PyObject *obj, const char *format, ...) +PyEval_CallFunction(PyObject *callable, const char *format, ...) { va_list vargs; PyObject *args; @@ -501,7 +501,7 @@ PyEval_CallFunction(PyObject *obj, const char *format, ...) if (args == NULL) return NULL; - res = PyEval_CallObject(obj, args); + res = PyEval_CallObject(callable, args); Py_DECREF(args); return res; @@ -509,14 +509,14 @@ PyEval_CallFunction(PyObject *obj, const char *format, ...) PyObject * -PyEval_CallMethod(PyObject *obj, const char *methodname, const char *format, ...) +PyEval_CallMethod(PyObject *obj, const char *name, const char *format, ...) { va_list vargs; PyObject *meth; PyObject *args; PyObject *res; - meth = PyObject_GetAttrString(obj, methodname); + meth = PyObject_GetAttrString(obj, name); if (meth == NULL) return NULL; |