Commit b0c079e3 authored by Fred Drake's avatar Fred Drake

PyObject_CallFunctionObArgs() ---> PyObject_CallFunctionObjArgs()

PyObject_CallMethodObArgs() ---> PyObject_CallMethodObjArgs()
parent 86443216
...@@ -208,9 +208,9 @@ determination. ...@@ -208,9 +208,9 @@ determination.
\end{cfuncdesc} \end{cfuncdesc}
\begin{cfuncdesc}{PyObject*}{PyObject_CallFunctionObArgs}{PyObject *callable, \begin{cfuncdesc}{PyObject*}{PyObject_CallFunctionObjArgs}{PyObject *callable,
\moreargs, \moreargs,
\code{NULL}} \code{NULL}}
Call a callable Python object \var{callable}, with a variable Call a callable Python object \var{callable}, with a variable
number of \ctype{PyObject*} arguments. The arguments are provided number of \ctype{PyObject*} arguments. The arguments are provided
as a variable number of parameters followed by \NULL. as a variable number of parameters followed by \NULL.
...@@ -219,10 +219,10 @@ determination. ...@@ -219,10 +219,10 @@ determination.
\end{cfuncdesc} \end{cfuncdesc}
\begin{cfuncdesc}{PyObject*}{PyObject_CallMethodObArgs}{PyObject *o, \begin{cfuncdesc}{PyObject*}{PyObject_CallMethodObjArgs}{PyObject *o,
PyObject *name, PyObject *name,
\moreargs, \moreargs,
\code{NULL}} \code{NULL}}
Calls a method of the object \var{o}, where the name of the method Calls a method of the object \var{o}, where the name of the method
is given as a Python string object in \var{name}. It is called with is given as a Python string object in \var{name}. It is called with
a variable number of \ctype{PyObject*} arguments. The arguments are a variable number of \ctype{PyObject*} arguments. The arguments are
......
...@@ -719,9 +719,9 @@ PyObject_CallFunction:PyObject*:callable_object:0: ...@@ -719,9 +719,9 @@ PyObject_CallFunction:PyObject*:callable_object:0:
PyObject_CallFunction:char*:format:: PyObject_CallFunction:char*:format::
PyObject_CallFunction::...:: PyObject_CallFunction::...::
PyObject_CallFunctionObArgs:PyObject*::+1: PyObject_CallFunctionObjArgs:PyObject*::+1:
PyObject_CallFunctionObArgs:PyObject*:callable:0: PyObject_CallFunctionObjArgs:PyObject*:callable:0:
PyObject_CallFunctionObArgs::...:: PyObject_CallFunctionObjArgs::...::
PyObject_CallMethod:PyObject*::+1: PyObject_CallMethod:PyObject*::+1:
PyObject_CallMethod:PyObject*:o:0: PyObject_CallMethod:PyObject*:o:0:
...@@ -729,10 +729,10 @@ PyObject_CallMethod:char*:m:: ...@@ -729,10 +729,10 @@ PyObject_CallMethod:char*:m::
PyObject_CallMethod:char*:format:: PyObject_CallMethod:char*:format::
PyObject_CallMethod::...:: PyObject_CallMethod::...::
PyObject_CallMethodObArgs:PyObject*::+1: PyObject_CallMethodObjArgs:PyObject*::+1:
PyObject_CallMethodObArgs:PyObject*:o:0: PyObject_CallMethodObjArgs:PyObject*:o:0:
PyObject_CallMethodObArgs:char*:name:: PyObject_CallMethodObjArgs:char*:name::
PyObject_CallMethodObArgs::...:: PyObject_CallMethodObjArgs::...::
PyObject_CallObject:PyObject*::+1: PyObject_CallObject:PyObject*::+1:
PyObject_CallObject:PyObject*:callable_object:0: PyObject_CallObject:PyObject*:callable_object:0:
......
...@@ -344,8 +344,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ ...@@ -344,8 +344,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
*/ */
DL_IMPORT(PyObject *) PyObject_CallFunctionObArgs(PyObject *callable, DL_IMPORT(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable,
...); ...);
/* /*
Call a callable Python object, callable_object, with a Call a callable Python object, callable_object, with a
...@@ -357,8 +357,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ ...@@ -357,8 +357,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
*/ */
DL_IMPORT(PyObject *) PyObject_CallMethodObArgs(PyObject *o, DL_IMPORT(PyObject *) PyObject_CallMethodObjArgs(PyObject *o,
PyObject *m, ...); PyObject *m, ...);
/* /*
Call the method named m of object o with a variable number of Call the method named m of object o with a variable number of
......
...@@ -1752,7 +1752,7 @@ PyObject_CallMethod(PyObject *o, char *name, char *format, ...) ...@@ -1752,7 +1752,7 @@ PyObject_CallMethod(PyObject *o, char *name, char *format, ...)
static PyObject * static PyObject *
obargs_mktuple(va_list va) objargs_mktuple(va_list va)
{ {
int i, n = 0; int i, n = 0;
va_list countva; va_list countva;
...@@ -1778,7 +1778,7 @@ obargs_mktuple(va_list va) ...@@ -1778,7 +1778,7 @@ obargs_mktuple(va_list va)
} }
PyObject * PyObject *
PyObject_CallMethodObArgs(PyObject *callable, PyObject *name, ...) PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...)
{ {
PyObject *args, *tmp; PyObject *args, *tmp;
va_list vargs; va_list vargs;
...@@ -1792,7 +1792,7 @@ PyObject_CallMethodObArgs(PyObject *callable, PyObject *name, ...) ...@@ -1792,7 +1792,7 @@ PyObject_CallMethodObArgs(PyObject *callable, PyObject *name, ...)
/* count the args */ /* count the args */
va_start(vargs, name); va_start(vargs, name);
args = obargs_mktuple(vargs); args = objargs_mktuple(vargs);
va_end(vargs); va_end(vargs);
if (args == NULL) { if (args == NULL) {
Py_DECREF(callable); Py_DECREF(callable);
...@@ -1806,7 +1806,7 @@ PyObject_CallMethodObArgs(PyObject *callable, PyObject *name, ...) ...@@ -1806,7 +1806,7 @@ PyObject_CallMethodObArgs(PyObject *callable, PyObject *name, ...)
} }
PyObject * PyObject *
PyObject_CallFunctionObArgs(PyObject *callable, ...) PyObject_CallFunctionObjArgs(PyObject *callable, ...)
{ {
PyObject *args, *tmp; PyObject *args, *tmp;
va_list vargs; va_list vargs;
...@@ -1816,7 +1816,7 @@ PyObject_CallFunctionObArgs(PyObject *callable, ...) ...@@ -1816,7 +1816,7 @@ PyObject_CallFunctionObArgs(PyObject *callable, ...)
/* count the args */ /* count the args */
va_start(vargs, callable); va_start(vargs, callable);
args = obargs_mktuple(vargs); args = objargs_mktuple(vargs);
va_end(vargs); va_end(vargs);
if (args == NULL) if (args == NULL)
return NULL; return NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment