mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 11:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Closes #17892: Fix the name of _PyObject_CallMethodObjIdArgs

Browse source
This commit is contained in:
Alexandre Vassalotti 2013-05-02 10:44:04 -07:00
parent 242db728e2
commit 865eaa1b53
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Include/abstract.h
View file

@ -339,11 +339,10 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o, PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o,
PyObject *method, ...); PyObject *method, ...);
PyAPI_FUNC(PyObject *) _PyObject_CallMethodObjIdArgs(PyObject *o, PyAPI_FUNC(PyObject *) _PyObject_CallMethodIdObjArgs(PyObject *o,
struct _Py_Identifier *method, struct _Py_Identifier *method,
...); ...);
/* /*
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
C arguments. The C arguments are provided as PyObject * C arguments. The C arguments are provided as PyObject *

2
Objects/abstract.c
View file

@ -2343,7 +2343,7 @@ PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...)
} }
PyObject * PyObject *
_PyObject_CallMethodObjIdArgs(PyObject *callable, _PyObject_CallMethodIdObjArgs(PyObject *callable,
struct _Py_Identifier *name, ...) struct _Py_Identifier *name, ...)
{ {
PyObject *args, *tmp; PyObject *args, *tmp;

8
Python/import.c
View file

@ -704,7 +704,7 @@ PyImport_ExecCodeModuleWithPathnames(char *name, PyObject *co, char *pathname,
"no interpreter!"); "no interpreter!");
} }
pathobj = _PyObject_CallMethodObjIdArgs(interp->importlib, pathobj = _PyObject_CallMethodIdObjArgs(interp->importlib,
&PyId__get_sourcefile, cpathobj, &PyId__get_sourcefile, cpathobj,
NULL); NULL);
if (pathobj == NULL) if (pathobj == NULL)
@ -1441,7 +1441,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
} }
if (initializing > 0) { if (initializing > 0) {
/* _bootstrap._lock_unlock_module() releases the import lock */ /* _bootstrap._lock_unlock_module() releases the import lock */
value = _PyObject_CallMethodObjIdArgs(interp->importlib, value = _PyObject_CallMethodIdObjArgs(interp->importlib,
&PyId__lock_unlock_module, abs_name, &PyId__lock_unlock_module, abs_name,
NULL); NULL);
if (value == NULL) if (value == NULL)
@ -1459,7 +1459,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
} }
else { else {
/* _bootstrap._find_and_load() releases the import lock */ /* _bootstrap._find_and_load() releases the import lock */
mod = _PyObject_CallMethodObjIdArgs(interp->importlib, mod = _PyObject_CallMethodIdObjArgs(interp->importlib,
&PyId__find_and_load, abs_name, &PyId__find_and_load, abs_name,
builtins_import, NULL); builtins_import, NULL);
if (mod == NULL) { if (mod == NULL) {
@ -1528,7 +1528,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
} }
} }
else { else {
final_mod = _PyObject_CallMethodObjIdArgs(interp->importlib, final_mod = _PyObject_CallMethodIdObjArgs(interp->importlib,
&PyId__handle_fromlist, mod, &PyId__handle_fromlist, mod,
fromlist, builtins_import, fromlist, builtins_import,
NULL); NULL);