diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2013-05-02 17:44:04 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2013-05-02 17:44:04 (GMT) |
| commit | 865eaa1b53b7f87e13e07f0e96c5659edf003ab1 (patch) | |
| tree | 65aad09c0ba512559c4c008ae0d62a6dac18b1d3 | |
| parent | 242db728e2fcbf9004143517d240301334b02545 (diff) | |
| download | cpython-865eaa1b53b7f87e13e07f0e96c5659edf003ab1.zip cpython-865eaa1b53b7f87e13e07f0e96c5659edf003ab1.tar.gz cpython-865eaa1b53b7f87e13e07f0e96c5659edf003ab1.tar.bz2 | |
Closes #17892: Fix the name of _PyObject_CallMethodObjIdArgs
| -rw-r--r-- | Include/abstract.h | 3 | ||||
| -rw-r--r-- | Objects/abstract.c | 2 | ||||
| -rw-r--r-- | Python/import.c | 8 |
3 files changed, 6 insertions, 7 deletions
diff --git a/Include/abstract.h b/Include/abstract.h index e2b0750..6f16913 100644 --- a/Include/abstract.h +++ b/Include/abstract.h @@ -339,11 +339,10 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o, PyObject *method, ...); - PyAPI_FUNC(PyObject *) _PyObject_CallMethodObjIdArgs(PyObject *o, + PyAPI_FUNC(PyObject *) _PyObject_CallMethodIdObjArgs(PyObject *o, struct _Py_Identifier *method, ...); - /* Call the method named m of object o with a variable number of C arguments. The C arguments are provided as PyObject * diff --git a/Objects/abstract.c b/Objects/abstract.c index bfd53c9..0934b95 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2343,7 +2343,7 @@ PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...) } PyObject * -_PyObject_CallMethodObjIdArgs(PyObject *callable, +_PyObject_CallMethodIdObjArgs(PyObject *callable, struct _Py_Identifier *name, ...) { PyObject *args, *tmp; diff --git a/Python/import.c b/Python/import.c index 805cdd7..b77eda1 100644 --- a/Python/import.c +++ b/Python/import.c @@ -704,7 +704,7 @@ PyImport_ExecCodeModuleWithPathnames(char *name, PyObject *co, char *pathname, "no interpreter!"); } - pathobj = _PyObject_CallMethodObjIdArgs(interp->importlib, + pathobj = _PyObject_CallMethodIdObjArgs(interp->importlib, &PyId__get_sourcefile, cpathobj, NULL); if (pathobj == NULL) @@ -1441,7 +1441,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals, } if (initializing > 0) { /* _bootstrap._lock_unlock_module() releases the import lock */ - value = _PyObject_CallMethodObjIdArgs(interp->importlib, + value = _PyObject_CallMethodIdObjArgs(interp->importlib, &PyId__lock_unlock_module, abs_name, NULL); if (value == NULL) @@ -1459,7 +1459,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals, } else { /* _bootstrap._find_and_load() releases the import lock */ - mod = _PyObject_CallMethodObjIdArgs(interp->importlib, + mod = _PyObject_CallMethodIdObjArgs(interp->importlib, &PyId__find_and_load, abs_name, builtins_import, NULL); if (mod == NULL) { @@ -1528,7 +1528,7 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals, } } else { - final_mod = _PyObject_CallMethodObjIdArgs(interp->importlib, + final_mod = _PyObject_CallMethodIdObjArgs(interp->importlib, &PyId__handle_fromlist, mod, fromlist, builtins_import, NULL); |