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

miss-islington · ZackerySpytz · web-flow · commit 5aa40e587e63 · 2020-05-29T12:35:21.000-07:00
Save the live exception during the course of remove_module(). (cherry picked from commit 94a64e9) Co-authored-by: Zackery Spytz <zspytz@gmail.com>
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-04-29-03-27-22.bpo-24048.vXxUDQ.rst b/Misc/NEWS.d/next/Core and Builtins/2019-04-29-03-27-22.bpo-24048.vXxUDQ.rst
@@ -0,0 +1 @@
+Save the live exception during import.c's ``remove_module()``.
diff --git a/Python/import.c b/Python/import.c
@@ -827,14 +827,18 @@ PyImport_AddModule(const char *name)
 static void
 remove_module(PyObject *name)
 {
+    PyObject *type, *value, *traceback;
+    PyErr_Fetch(&type, &value, &traceback);
     PyObject *modules = PyImport_GetModuleDict();
+    if (!PyMapping_HasKey(modules, name)) {
+        goto out;
+    }
     if (PyMapping_DelItem(modules, name) < 0) {
-        if (!PyMapping_HasKey(modules, name)) {
-            return;
-        }
         Py_FatalError("import:  deleting existing key in "
                       "sys.modules failed");
     }
+out:
+    PyErr_Restore(type, value, traceback);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Save the live exception during import.c's ``remove_module()``.