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

[3.12] gh-121735: Fix module-adjacent references in zip files (gh-123037) #124011

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 3 commits into from
Sep 24, 2024
Merged

[3.12] gh-121735: Fix module-adjacent references in zip files (gh-123037) #124011

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dde843d
[3.12] gh-121735: Fix module-adjacent references in zip files
jaraco Sep 12, 2024
5994e7e
Backport the test capturing the behavior selectively.
jaraco Sep 12, 2024
b0b7da1
Bring back the blurb.
jaraco Sep 12, 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
Backport the test capturing the behavior selectively.
  • Loading branch information
@jaraco
jaraco committed Sep 12, 2024
commit 5994e7e901085b9cadb318a0053b15bc35192fbc
36 changes: 36 additions & 0 deletions Lib/test/test_importlib/resources/test_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,42 @@ def test_implicit_files(self):
_path.build(spec, self.site_dir)
assert importlib.import_module('somepkg').val == 'resources are the best'

def test_implicit_files_zip_submodule(self):
"""
Special test for gh-121735 for Python 3.12.
"""
import os
import zipfile

def create_zip_from_directory(source_dir, zip_filename):
with zipfile.ZipFile(zip_filename, 'w') as zipf:
for root, _, files in os.walk(source_dir):
for file in files:
file_path = os.path.join(root, file)
# Ensure files are at the root
arcname = os.path.relpath(file_path, source_dir)
zipf.write(file_path, arcname)

set_val = textwrap.dedent(
"""
import importlib.resources as res
val = res.files().joinpath('res.txt').read_text(encoding='utf-8')
"""
)
spec = {
'somepkg': {
'__init__.py': set_val,
'submod.py': set_val,
'res.txt': 'resources are the best',
},
}
build_dir = self.fixtures.enter_context(os_helper.temp_dir())
_path.build(spec, build_dir)
zip_file = os.path.join(self.site_dir, 'thepkg.zip')
create_zip_from_directory(build_dir, zip_file)
self.fixtures.enter_context(import_helper.DirsOnSysPath(zip_file))
assert importlib.import_module('somepkg.submod').val == 'resources are the best'


if __name__ == '__main__':
unittest.main()
0