From 27fc52877ce3cabb2ed524ab0f40f8c8e3a45c18 Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Sun, 15 Apr 2012 14:15:31 -0400
Subject: Set ImportError.name when raising the exception in the case of None
 found in sys.modules.

---
 Python/import.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Python/import.c b/Python/import.c
index 5136d98..d4f5783 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -2980,8 +2980,11 @@ PyImport_ImportModuleLevelObject(PyObject *name, PyObject *given_globals,
 
     mod = PyDict_GetItem(interp->modules, abs_name);
     if (mod == Py_None) {
-        PyErr_Format(PyExc_ImportError,
-                     "import of %R halted; None in sys.modules", abs_name);
+        PyObject *msg = PyUnicode_FromFormat("import of %R halted; "
+                                             "None in sys.modules", abs_name);
+        if (msg != NULL) {
+            PyErr_SetFromImportErrorWithName(msg, abs_name);
+        }
         goto error_with_unlock;
     }
     else if (mod != NULL) {
-- 
cgit v0.12