From 5aa40e587e63bcad22c7e196fc3559e2b5e0792b Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Fri, 29 May 2020 12:35:21 -0700 Subject: bpo-24048: Save the live exception during import.c's remove_module() (GH-13005) Save the live exception during the course of remove_module(). (cherry picked from commit 94a64e9cd411a87514b68082c1c437eb3b49dfb9) Co-authored-by: Zackery Spytz --- .../Core and Builtins/2019-04-29-03-27-22.bpo-24048.vXxUDQ.rst | 1 + Python/import.c | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2019-04-29-03-27-22.bpo-24048.vXxUDQ.rst 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 new file mode 100644 index 0000000..27c86a4 --- /dev/null +++ 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 index 6d014cf..d436d57 100644 --- 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); } -- cgit v0.12