8000 gh-121735: Fix module-adjacent references in zip files by jaraco · Pull Request #123037 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-121735: Fix module-adjacent references in zip files #123037

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 8 commits into from
Sep 12, 2024
Merged

gh-121735: Fix module-adjacent references in zip files #123037

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b067b03
gh-116608: Apply style and compatibility changes from importlib_metad…
jaraco Aug 14, 2024
5114623
gh-121735: Ensure module-adjacent resources are loadable from a zipfile.
jaraco Aug 15, 2024
0e62d51
gh-121735: Allow all modules to be processed by the ZipReader.
jaraco Aug 15, 2024
7eb00c9
Add blurb
jaraco Aug 15, 2024
f65f7f9
Remove update-zips script, unneeded.
jaraco Aug 15, 2024
02492be
Remove unnecessary references to removed static fixtures.
jaraco Aug 15, 2024
0bd9acc
Remove zipdata fixtures, unused.
jaraco Aug 15, 2024
b9ce84f
Merge branch 'main' into gh-121735/zip-module-resources
jaraco Aug 15, 2024
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
gh-121735: Allow all modules to be processed by the ZipReader.
  • Loading branch information
@jaraco
jaraco committed Aug 15, 2024
commit 0e62d515258d29d5df2e4dd159f5aca0492cb2d1
12 changes: 2 additions & 10 deletions Lib/zipimport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,17 +256,9 @@ def load_module(self, fullname):


def get_resource_reader(self, fullname):
"""Return the ResourceReader for a package in a zip file.

If 'fullname' is a package within the zip file, return the
'ResourceReader' object for the package. Otherwise return None.
"""
try:
if not self.is_package(fullname):
return None
except ZipImportError:
return None
"""Return the ResourceReader for a module in a zip file."""
from importlib.readers import ZipReader

return ZipReader(self, fullname)


Expand Down
0