#18681: merge with 3.3.

3 files changed, 12 insertions, 1 deletions

diff --git a/Lib/importlib/__init__.py b/Lib/importlib/__init__.py
index d456c48..aab54a7 100644
--- a/Lib/importlib/__init__.py
+++ b/Lib/importlib/__init__.py
@@ -115,7 +115,7 @@ def reload(module):
         parent_name = name.rpartition('.')[0]
         if parent_name and parent_name not in sys.modules:
             msg = "parent {!r} not in sys.modules"
-            raise ImportError(msg.format(parentname), name=parent_name)
+            raise ImportError(msg.format(parent_name), name=parent_name)
         return module.__loader__.load_module(name)
     finally:
         try:
diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
index cf50ea4..833bf19 100644
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -314,6 +314,15 @@ class ReloadTests(unittest.TestCase):
             import marshal
             imp.reload(marshal)
 
+    def test_with_deleted_parent(self):
+        # see #18681
+        from html import parser
+        del sys.modules['html']
+        def cleanup(): del sys.modules['html.parser']
+        self.addCleanup(cleanup)
+        with self.assertRaisesRegex(ImportError, 'html'):
+            imp.reload(parser)
+
 
 class PEP3147Tests(unittest.TestCase):
     """Tests of PEP 3147."""
diff --git a/Misc/NEWS b/Misc/NEWS
index d504066..c79a21b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -221,6 +221,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #18681: Fix a NameError in importlib.reload() (noticed by Weizhao Li).
+
 - Issue #14323: Expanded the number of digits in the coefficients for the
   RGB -- YIQ conversions so that they match the FCC NTSC versions.