PyObject_CallFunctionObArgs() ---> PyObject_CallFunctionObjArgs()
PyObject_CallMethodObArgs() ---> PyObject_CallMethodObjArgs()
diff --git a/Doc/api/abstract.tex b/Doc/api/abstract.tex
index 2e85dac..3078e90 100644
--- a/Doc/api/abstract.tex
+++ b/Doc/api/abstract.tex
@@ -208,9 +208,9 @@
\end{cfuncdesc}
-\begin{cfuncdesc}{PyObject*}{PyObject_CallFunctionObArgs}{PyObject *callable,
- \moreargs,
- \code{NULL}}
+\begin{cfuncdesc}{PyObject*}{PyObject_CallFunctionObjArgs}{PyObject *callable,
+ \moreargs,
+ \code{NULL}}
Call a callable Python object \var{callable}, with a variable
number of \ctype{PyObject*} arguments. The arguments are provided
as a variable number of parameters followed by \NULL.
@@ -219,10 +219,10 @@
\end{cfuncdesc}
-\begin{cfuncdesc}{PyObject*}{PyObject_CallMethodObArgs}{PyObject *o,
- PyObject *name,
- \moreargs,
- \code{NULL}}
+\begin{cfuncdesc}{PyObject*}{PyObject_CallMethodObjArgs}{PyObject *o,
+ PyObject *name,
+ \moreargs,
+ \code{NULL}}
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
a variable number of \ctype{PyObject*} arguments. The arguments are
diff --git a/Doc/api/refcounts.dat b/Doc/api/refcounts.dat
index 374cdf1..31b3f5e 100644
--- a/Doc/api/refcounts.dat
+++ b/Doc/api/refcounts.dat
@@ -719,9 +719,9 @@
PyObject_CallFunction:char*:format::
PyObject_CallFunction::...::
-PyObject_CallFunctionObArgs:PyObject*::+1:
-PyObject_CallFunctionObArgs:PyObject*:callable:0:
-PyObject_CallFunctionObArgs::...::
+PyObject_CallFunctionObjArgs:PyObject*::+1:
+PyObject_CallFunctionObjArgs:PyObject*:callable:0:
+PyObject_CallFunctionObjArgs::...::
PyObject_CallMethod:PyObject*::+1:
PyObject_CallMethod:PyObject*:o:0:
@@ -729,10 +729,10 @@
PyObject_CallMethod:char*:format::
PyObject_CallMethod::...::
-PyObject_CallMethodObArgs:PyObject*::+1:
-PyObject_CallMethodObArgs:PyObject*:o:0:
-PyObject_CallMethodObArgs:char*:name::
-PyObject_CallMethodObArgs::...::
+PyObject_CallMethodObjArgs:PyObject*::+1:
+PyObject_CallMethodObjArgs:PyObject*:o:0:
+PyObject_CallMethodObjArgs:char*:name::
+PyObject_CallMethodObjArgs::...::
PyObject_CallObject:PyObject*::+1:
PyObject_CallObject:PyObject*:callable_object:0:
diff --git a/Include/abstract.h b/Include/abstract.h
index 0d44f6d..8ebc3cd 100644
--- a/Include/abstract.h
+++ b/Include/abstract.h
@@ -344,8 +344,8 @@
*/
- DL_IMPORT(PyObject *) PyObject_CallFunctionObArgs(PyObject *callable,
- ...);
+ DL_IMPORT(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable,
+ ...);
/*
Call a callable Python object, callable_object, with a
@@ -357,8 +357,8 @@
*/
- DL_IMPORT(PyObject *) PyObject_CallMethodObArgs(PyObject *o,
- PyObject *m, ...);
+ DL_IMPORT(PyObject *) PyObject_CallMethodObjArgs(PyObject *o,
+ PyObject *m, ...);
/*
Call the method named m of object o with a variable number of
diff --git a/Objects/abstract.c b/Objects/abstract.c
index 8f77120..9f4a13f 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -1752,7 +1752,7 @@
static PyObject *
-obargs_mktuple(va_list va)
+objargs_mktuple(va_list va)
{
int i, n = 0;
va_list countva;
@@ -1778,7 +1778,7 @@
}
PyObject *
-PyObject_CallMethodObArgs(PyObject *callable, PyObject *name, ...)
+PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...)
{
PyObject *args, *tmp;
va_list vargs;
@@ -1792,7 +1792,7 @@
/* count the args */
va_start(vargs, name);
- args = obargs_mktuple(vargs);
+ args = objargs_mktuple(vargs);
va_end(vargs);
if (args == NULL) {
Py_DECREF(callable);
@@ -1806,7 +1806,7 @@
}
PyObject *
-PyObject_CallFunctionObArgs(PyObject *callable, ...)
+PyObject_CallFunctionObjArgs(PyObject *callable, ...)
{
PyObject *args, *tmp;
va_list vargs;
@@ -1816,7 +1816,7 @@
/* count the args */
va_start(vargs, callable);
- args = obargs_mktuple(vargs);
+ args = objargs_mktuple(vargs);
va_end(vargs);
if (args == NULL)
return NULL;