8000 gh-103200: Fix performance issues with `zipimport.invalidate_caches()` by desmondcheongzx · Pull Request #103208 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-103200: Fix performance issues with zipimport.invalidate_caches() #103208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jul 7, 2023
Merged

gh-103200: Fix performance issues with zipimport.invalidate_caches() #103208

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e01f4f6
Fix zipimport invalidate caches
desmondcheongzx Apr 3, 2023
3be0af8
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 3, 2023
e2bd85a
Clean up zipimporter initialisation
desmondcheongzx Apr 3, 2023
276ea4f
Merge branch 'main' into fix-zipimport-invalidate-caches
brettcannon May 12, 2023
dd160ab
Merge branch 'main' into fix-zipimport-invalidate-caches
brettcannon Jun 9, 2023
4b5fe9d
Add a test case with multiple zip imports
desmondcheongzx Jul 4, 2023
27edee8
Remove separate key for invalidating cache
desmondcheongzx Jul 4, 2023
eaaa0dc
Merge branch 'main' into fix-zipimport-invalidate-caches
desmondcheongzx Jul 4, 2023
32bce14
Clean up implementation
desmondcheongzx Jul 4, 2023
56dd77e
Add proper punctuation to comments
brettcannon Jul 7, 2023
d0afd94
Merge branch 'main' into fix-zipimport-invalidate-caches
brettcannon Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add a test case with multiple zip imports
  • Loading branch information
@desmondcheongzx
desmondcheongzx committed Jul 4, 2023
commit 4b5fe9d0281a97f015079a55f53f2d6ac1dde26d
37 changes: 37 additions & 0 deletions Lib/test/test_zipimport.py
8000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,43 @@ def testInvalidateCaches(self):
self.assertIsNone(zipimport._zip_directory_cache.get(zi.archive))
self.assertIsNone(zi.find_spec("name_does_not_matter"))

def testInvalidateCachesWithMultipleZipimports(self):
packdir = TESTPACK + os.sep
packdir2 = packdir + TESTPACK2 + os.sep
files = {packdir + "__init__" + pyc_ext: (NOW, test_pyc),
packdir2 + "__init__" + pyc_ext: (NOW, test_pyc),
packdir2 + TESTMOD + pyc_ext: (NOW, test_pyc),
"spam" + pyc_ext: (NOW, test_pyc)}
self.addCleanup(os_helper.unlink, TEMP_ZIP)
with ZipFile(TEMP_ZIP, "w") as z:
for name, (mtime, data) in files.items():
zinfo = ZipInfo(name, time.localtime(mtime))
zinfo.compress_type = self.compression
zinfo.comment = b"spam"
z.writestr(zinfo, data)

zi = zipimport.zipimporter(TEMP_ZIP)
self.assertEqual(zi._get_files().keys(), files.keys())
# Zipimport the same path
zi2 = zipimport.zipimporter(TEMP_ZIP)
self.assertEqual(zi2._get_files().keys(), files.keys())
# Add a new file to the ZIP archive
newfile = {"spam2" + pyc_ext: (NOW, test_pyc)}
files.update(newfile)
with ZipFile(TEMP_ZIP, "a") as z:
for name, (mtime, data) in newfile.items():
zinfo = ZipInfo(name, time.localtime(mtime))
zinfo.compress_type = self.compression
zinfo.comment = b"spam"
z.writestr(zinfo, data)
# Invalidate the cache of the first zipimporter
zi.invalidate_caches()
# Check that the second zipimporter detects the new file
self.assertEqual(zi2._get_files().keys(), files.keys())
spec = zi2.find_spec('spam2')
self.assertIsNotNone(spec)
self.assertIsInstance(spec.loader, zipimport.zipimporter)

def testZipImporterMethodsInSubDirectory(self):
packdir = TESTPACK + os.sep
packdir2 = packdir + TESTPACK2 + os.sep
Expand Down
0