commit cdd8d4d6dd57f4c9429566706009d4613277d391
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Mar 25 14:36:43 2019 -0700
committer Stefan Krah <skrah@bytereef.org> Mon Mar 25 22:36:43 2019 +0100
tree ef8ff48e6365df8353edb58c1bf3e7a902e33b25
parent f3c5535f63e7cd49166ab33b7b0ebb3285ef4ed0

bpo-36370: Check for PyErr_Occurred() after PyImport_GetModule() (GH-12504)

Python/pylifecycle.c

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 94b6d43..d8e6f8f 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -2239,8 +2239,10 @@
     PyObject *result;
     PyObject *threading = _PyImport_GetModuleId(&PyId_threading);
     if (threading == NULL) {
-        /* threading not imported */
-        PyErr_Clear();
+        if (PyErr_Occurred()) {
+            PyErr_WriteUnraisable(NULL);
+        }
+        /* else: threading not imported */
         return;
     }
     result = _PyObject_CallMethodId(threading, &PyId__shutdown, NULL);