bpo-39033: Fix NameError in zipimport during hash validation (pythonGH-17588)

tirkarthi · ncoghlan · commit 79f02fee1a54 · 2019-12-16T09:34:12.000+10:00
Patch by Karthikeyan Singaravelan.
diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
@@ -6,6 +6,7 @@
 import struct
 import time
 import unittest
+import unittest.mock
 
 from test import support
 
@@ -204,6 +205,21 @@ def check(mod):
             self.assertEqual(mod.state, 'old')
         self.doTest(None, files, TESTMOD, call=check)
 
+    @unittest.mock.patch('_imp.check_hash_based_pycs', 'always')
+    def test_checked_hash_based_change_pyc(self):
+        source = b"state = 'old'"
+        source_hash = importlib.util.source_hash(source)
+        bytecode = importlib._bootstrap_external._code_to_hash_pyc(
+            compile(source, "???", "exec"),
+            source_hash,
+            False,
+        )
+        files = {TESTMOD + ".py": (NOW, "state = 'new'"),
+                 TESTMOD + ".pyc": (NOW - 20, bytecode)}
+        def check(mod):
+            self.assertEqual(mod.state, 'new')
+        self.doTest(None, files, TESTMOD, call=check)
+
     def testEmptyPy(self):
         files = {TESTMOD + ".py": (NOW, "")}
         self.doTest(None, files, TESTMOD)
diff --git a/Lib/zipimport.py b/Lib/zipimport.py
@@ -608,7 +608,7 @@ def _unmarshal_code(self, pathname, fullpath, fullname, data):
                 )
 
                 try:
-                    _boostrap_external._validate_hash_pyc(
+                    _bootstrap_external._validate_hash_pyc(
                         data, source_hash, fullname, exc_details)
                 except ImportError:
                     return None
diff --git a/Misc/ACKS b/Misc/ACKS
@@ -1901,3 +1901,4 @@ Tim Hopper
 Dan Lidral-Porter
 Ngalim Siregar
 Tim Gates
+Karthikeyan Singaravelan
diff --git a/Misc/NEWS.d/next/Library/2019-12-13-18-54-49.bpo-39033.cepuyD.rst b/Misc/NEWS.d/next/Library/2019-12-13-18-54-49.bpo-39033.cepuyD.rst
@@ -0,0 +1 @@
+Fix :exc:`NameError` in :mod:`zipimport`. Patch by Karthikeyan Singaravelan.
diff --git a/Python/importlib_zipimport.h b/Python/importlib_zipimport.h

Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,7 @@ def _unmarshal_code(self, pathname, fullpath, fullname, data):`
`608`	`608`	`)`
`609`	`609`
`610`	`610`	`try:`
`611`		`- _boostrap_external._validate_hash_pyc(`
	`611`	`+ _bootstrap_external._validate_hash_pyc(`
`612`	`612`	`data, source_hash, fullname, exc_details)`
`613`	`613`	`except ImportError:`
`614`	`614`	`return None`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix :exc:`NameError` in :mod:`zipimport`. Patch by Karthikeyan Singaravelan.