commit 273323cf68e8d55c67622412ecf531e359a54e11
author Brett Cannon <brett@python.org> Tue Apr 17 19:05:11 2012 -0400
committer Brett Cannon <brett@python.org> Tue Apr 17 19:05:11 2012 -0400
tree ddac9de01083d9e7a165c83455493ee31d32ce21
parent 09b86d1196427f2028d7e072b106847d8c693815

Issue #14592: A relative import will raise a KeyError if __package__
or __name__ are not set in globals.

Thanks to Stefan Behnel for the bug report.

Python/import.c

diff --git a/Python/import.c b/Python/import.c
index f3de7d8..3e620b3 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -2355,8 +2355,9 @@
             }
         }
         else {
-            package = _PyDict_GetItemIdWithError(globals, &PyId___name__);
+            package = _PyDict_GetItemId(globals, &PyId___name__);
             if (package == NULL) {
+                PyErr_SetString(PyExc_KeyError, "'__name__' not in globals");
                 goto error;
             }
             else if (!PyUnicode_Check(package)) {