Mercurial > cpython-lru_cache-weakref

diff Python/import.c @ 72835:5e33219492bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add API for static strings, primarily good for identifiers. Thanks to Konrad Schöbel and Jasper Schulz for helping with the mass-editing.
author Martin v. Löwis <martin@v.loewis.de>
date Sun, 09 Oct 2011 10:38:36 +0200
parents c97ba8f80935
children 81380082d216
line wrap: on
line diff
--- a/Python/import.c	Sun Oct 09 08:58:16 2011 +0200
+++ b/Python/import.c	Sun Oct 09 10:38:36 2011 +0200
@@ -1801,6 +1801,7 @@
 
     /* sys.path_hooks import hook */
     if (p_loader != NULL) {
+        _Py_identifier(find_module);
         PyObject *importer;
 
         importer = get_path_importer(path_importer_cache,
@@ -1811,8 +1812,8 @@
         /* Note: importer is a borrowed reference */
         if (importer != Py_None) {
             PyObject *loader;
-            loader = PyObject_CallMethod(importer,
-                                         "find_module", "O", fullname);
+            loader = _PyObject_CallMethodId(importer,
+                                            &PyId_find_module, "O", fullname);
             if (loader == NULL)
                 return -1;  /* error */
             if (loader != Py_None) {
@@ -2030,6 +2031,7 @@
 
     /* sys.meta_path import hook */
     if (p_loader != NULL) {
+        _Py_identifier(find_module);
         PyObject *meta_path;
 
         meta_path = PySys_GetObject("meta_path");
@@ -2044,7 +2046,7 @@
         for (i = 0; i < npath; i++) {
             PyObject *loader;
             PyObject *hook = PyList_GetItem(meta_path, i);
-            loader = PyObject_CallMethod(hook, "find_module",
+            loader = _PyObject_CallMethodId(hook, &PyId_find_module,
                                          "OO", fullname,
                                          search_path_list != NULL ?
                                          search_path_list : Py_None);
@@ -2454,12 +2456,13 @@
         break;
 
     case IMP_HOOK: {
+        _Py_identifier(load_module);
         if (loader == NULL) {
             PyErr_SetString(PyExc_ImportError,
                             "import hook without loader");
             return NULL;
         }
-        m = PyObject_CallMethod(loader, "load_module", "O", name);
+        m = _PyObject_CallMethodId(loader, &PyId_load_module, "O", name);
         break;
     }