diff options
| author | Brett Cannon <brett@python.org> | 2021-09-17 23:48:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-17 23:48:17 (GMT) |
| commit | 209b7035f714dcc41df054b0b023e0b955d7e1a2 (patch) | |
| tree | 41c4c89c7bb103a6858169c72ef79a559bb6260b | |
| parent | f4813388b4506b2fafb0089848c5b11cd503758c (diff) | |
| download | cpython-209b7035f714dcc41df054b0b023e0b955d7e1a2.zip cpython-209b7035f714dcc41df054b0b023e0b955d7e1a2.tar.gz cpython-209b7035f714dcc41df054b0b023e0b955d7e1a2.tar.bz2 | |
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).
| -rw-r--r-- | Lib/test/test_zipimport.py | 3 | ||||
| -rw-r--r-- | Lib/zipimport.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2021-09-17-15-58-53.bpo-45183.Vv_vch.rst | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py index 938674f..486200a 100644 --- a/Lib/test/test_zipimport.py +++ b/Lib/test/test_zipimport.py @@ -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 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 @@ 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): diff --git a/Misc/NEWS.d/next/Library/2021-09-17-15-58-53.bpo-45183.Vv_vch.rst b/Misc/NEWS.d/next/Library/2021-09-17-15-58-53.bpo-45183.Vv_vch.rst new file mode 100644 index 0000000..f3194b3 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-09-17-15-58-53.bpo-45183.Vv_vch.rst @@ -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(). |