Mercurial > cpython-lru_cache-weakref
diff Python/import.c @ 72386:3ff9a2d5f5e5
Merge 3.2: Fix the import machinery if there is an error on sys.path or sys.meta_path
find_module() now raises a RuntimeError, instead of ImportError, on an error on
sys.path or sys.meta_path because load_package() and import_submodule() returns
None and clear the exception if a ImportError occurred.
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Thu, 15 Sep 2011 19:38:54 +0200 |
| parents | aaab27d4c99c 4247f5e221c6 |
| children | 03843a8d3244 |
line wrap: on
line diff
--- a/Python/import.c Thu Sep 15 18:18:51 2011 +0200 +++ b/Python/import.c Thu Sep 15 19:38:54 2011 +0200 @@ -1992,7 +1992,7 @@ meta_path = PySys_GetObject("meta_path"); if (meta_path == NULL || !PyList_Check(meta_path)) { - PyErr_SetString(PyExc_ImportError, + PyErr_SetString(PyExc_RuntimeError, "sys.meta_path must be a list of " "import hooks"); return NULL; @@ -2044,14 +2044,14 @@ } if (search_path_list == NULL || !PyList_Check(search_path_list)) { - PyErr_SetString(PyExc_ImportError, + PyErr_SetString(PyExc_RuntimeError, "sys.path must be a list of directory names"); return NULL; } path_hooks = PySys_GetObject("path_hooks"); if (path_hooks == NULL || !PyList_Check(path_hooks)) { - PyErr_SetString(PyExc_ImportError, + PyErr_SetString(PyExc_RuntimeError, "sys.path_hooks must be a list of " "import hooks"); return NULL; @@ -2059,7 +2059,7 @@ path_importer_cache = PySys_GetObject("path_importer_cache"); if (path_importer_cache == NULL || !PyDict_Check(path_importer_cache)) { - PyErr_SetString(PyExc_ImportError, + PyErr_SetString(PyExc_RuntimeError, "sys.path_importer_cache must be a dict"); return NULL; }