commit e1bdecb6dc7ac33256d5fa875d45634512d2a90e
author Brett Cannon <brett@python.org> Fri Sep 17 17:46:22 2021 -0700
committer GitHub <noreply@github.com> Fri Sep 17 17:46:22 2021 -0700
tree 16ee13faa6339c9acd6846ccfeaacdc4d979189b
parent 397dad4001cd402cf4843ab44963932ea81c2e73

[3.10] bpo-45183: don't raise an exception when calling zipimport.zipimporter.find_spec() when the zip file is missing and the internal cache has been reset (GH-28435) (#28438)

This can occur when the zip file gets deleted, you call zipimport.zipimporter.invalidate_cache(), and then try to use zipimport.zipimporter.find_spec() (i.e. you left the zip file path on sys.path).
(cherry picked from commit 209b7035f714dcc41df054b0b023e0b955d7e1a2)

Co-authored-by: Brett Cannon <brett@python.org>

Lib/test/test_zipimport.py

diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index f6f5ca4..8acfeef 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -547,8 +547,9 @@ def testInvalidateCaches(self):
         # Check that the cached data is removed if the file is deleted
         os.remove(TEMP_ZIP)
         zi.invalidate_caches()
-        self.assertIsNone(zi._files)
+        self.assertFalse(zi._files)
         self.assertIsNone(zipimport._zip_directory_cache.get(zi.archive))
+        self.assertIsNone(zi.find_spec("name_does_not_matter"))
 
     def testZipImporterMethodsInSubDirectory(self):
         packdir = TESTPACK + os.sep

Lib/zipimport.py

diff --git a/Lib/zipimport.py b/Lib/zipimport.py
index c55fec6..25eaee9 100644
--- a/Lib/zipimport.py
+++ b/Lib/zipimport.py
@@ -334,7 +334,7 @@ def invalidate_caches(self):
             _zip_directory_cache[self.archive] = self._files
         except ZipImportError:
             _zip_directory_cache.pop(self.archive, None)
-            self._files = None
+            self._files = {}
 
 
     def __repr__(self):