mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-28 01:00:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #14582: Import returns the module returned by a loader instead

Browse source 
of sys.modules when possible.

This is being done for two reasons. One is to gain a little bit of
performance by skipping an unnecessary dict lookup in sys.modules. But
the other (and main) reason is to be a little bit more clear in how
things should work from the perspective of import's interactions with
loaders. Otherwise loaders can easily forget to return the module even
though PEP 302 explicitly states they are expected to return the module
they loaded.
This commit is contained in:
Brett Cannon 2012-04-15 15:24:04 -04:00
parent 27fc52877c
commit 881535b726
5 changed files with 497 additions and 503 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Python/import.c
View file

@ -3019,15 +3019,22 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
Py_DECREF(partition);
if (level == 0) {
final_mod = PyDict_GetItem(interp->modules, front);
Py_DECREF(front);
if (final_mod == NULL) {
PyErr_Format(PyExc_KeyError,
"%R not in sys.modules as expected", front);
if (PyUnicode_GET_LENGTH(name) ==
PyUnicode_GET_LENGTH(front)) {
final_mod = mod;
}
else {
Py_INCREF(final_mod);
final_mod = PyDict_GetItem(interp->modules, front);
if (final_mod == NULL) {
PyErr_Format(PyExc_KeyError,
"%R not in sys.modules as expected", front);
}
}
Py_DECREF(front);
if (final_mod == NULL) {
goto error_with_unlock;
}
Py_INCREF(final_mod);
}
else {
Py_ssize_t cut_off = PyUnicode_GetLength(name) -