Mercurial > cpython-lru_cache-weakref

diff Python/import.c @ 83590:8a364deb0225

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Closes #17892: Fix the name of _PyObject_CallMethodObjIdArgs
author Alexandre Vassalotti <alexandre@peadrop.com>
date Thu, 02 May 2013 10:44:04 -0700
parents 393723b646a4
children f0833e6ff2d2
line wrap: on
line diff
--- a/Python/import.c	Wed May 01 20:52:07 2013 +0200
+++ b/Python/import.c	Thu May 02 10:44:04 2013 -0700
@@ -704,7 +704,7 @@
                           "no interpreter!");
         }
 
-        pathobj = _PyObject_CallMethodObjIdArgs(interp->importlib,
+        pathobj = _PyObject_CallMethodIdObjArgs(interp->importlib,
                                                 &PyId__get_sourcefile, cpathobj,
                                                 NULL);
         if (pathobj == NULL)
@@ -1441,7 +1441,7 @@
         }
         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 @@
     }
     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 @@
         }
     }
     else {
-        final_mod = _PyObject_CallMethodObjIdArgs(interp->importlib,
+        final_mod = _PyObject_CallMethodIdObjArgs(interp->importlib,
                                                   &PyId__handle_fromlist, mod,
                                                   fromlist, builtins_import,
                                                   NULL);