mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Set ImportError.name when raising the exception in the case of None

Browse source 
found in sys.modules.
This commit is contained in:
Brett Cannon 2012-04-15 14:15:31 -04:00
parent da4210f77d
commit 27fc52877c
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Python/import.c
View file

@ -2980,8 +2980,11 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
mod = PyDict_GetItem(interp->modules, abs_name); mod = PyDict_GetItem(interp->modules, abs_name);
if (mod == Py_None) { if (mod == Py_None) {
PyErr_Format(PyExc_ImportError, PyObject *msg = PyUnicode_FromFormat("import of %R halted; "
"import of %R halted; None in sys.modules", abs_name); "None in sys.modules", abs_name);
if (msg != NULL) {
PyErr_SetFromImportErrorWithName(msg, abs_name);
}
goto error_with_unlock; goto error_with_unlock;
} }
else if (mod != NULL) { else if (mod != NULL) {