bpo-30626: Fix error handling in PyImport_Import(). (#2103)

In rare circumstances PyImport_Import() could return NULL without raising
an error.

diff --git a/Python/import.c b/Python/import.c
index 9a78d6adc7a2af85b416ff04144b85e8c9e7db5c..d8a207b4b369afc564a0c6277fe570608d7783da 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -1784,9 +1784,13 @@ PyImport_Import(PyObject *module_name)
     Py_DECREF(r);
 
     modules = PyImport_GetModuleDict();
-    r = PyDict_GetItem(modules, module_name);
-    if (r != NULL)
+    r = PyDict_GetItemWithError(modules, module_name);
+    if (r != NULL) {
         Py_INCREF(r);
+    }
+    else if (!PyErr_Occurred()) {
+        PyErr_SetObject(PyExc_KeyError, module_name);
+    }
 
   err:
     Py_XDECREF(globals);