Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-24048: Save the live exception during import.c's remove_module() (GH-13005) 

Save the live exception during the course of remove_module().
This commit is contained in:
Zackery Spytz 2019-05-08 10:31:23 -06:00 committed by Nick Coghlan
parent 85225b6a58
commit 94a64e9cd4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Core and Builtins/2019-04-29-03-27-22.bpo-24048.vXxUDQ.rst Normal file
View File

@ -0,0 +1 @@
Save the live exception during import.c's ``remove_module()``.

10
Python/import.c
View File

@ -837,14 +837,18 @@ PyImport_AddModule(const char *name)
static void static void
remove_module(PyObject *name) remove_module(PyObject *name)
{ {
PyObject *type, *value, *traceback;
PyErr_Fetch(&type, &value, &traceback);
PyObject *modules = PyImport_GetModuleDict(); PyObject *modules = PyImport_GetModuleDict();
if (!PyMapping_HasKey(modules, name)) {
goto out;
}
if (PyMapping_DelItem(modules, name) < 0) { if (PyMapping_DelItem(modules, name) < 0) {
if (!PyMapping_HasKey(modules, name)) {
return;
}
Py_FatalError("import: deleting existing key in " Py_FatalError("import: deleting existing key in "
"sys.modules failed"); "sys.modules failed");
} }
out:
PyErr_Restore(type, value, traceback);
} }