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)

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).
This commit is contained in:
Brett Cannon 2021-09-17 16:48:17 -07:00 committed by GitHub
parent f4813388b4
commit 209b7035f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions

View File

@ -548,8 +548,9 @@ class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
# 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

View File

@ -334,7 +334,7 @@ class zipimporter(_bootstrap_external._LoaderBasics):
_zip_directory_cache[self.archive] = self._files
except ZipImportError:
_zip_directory_cache.pop(self.archive, None)
self._files = None
self._files = {}
def __repr__(self):

View File

@ -0,0 +1,3 @@
Have zipimport.zipimporter.find_spec() not raise an exception when the underlying zip
file has been deleted and the internal cache has been reset via
invalidate_cache().