Skip to content

gh-121111: Fix zipimport incorrectly dealing with namespace packages #121161

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

Closed
ZeroIntensity wants to merge 8 commits into from
Closed

gh-121111: Fix zipimport incorrectly dealing with namespace packages #121161

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3fe135e
Switch to replace() instead of rpartition() in _get_module_path()
ZeroIntensity Jun 29, 2024
439db09
Add new unit test for zipimporting a nested submodule
ZeroIntensity Jun 29, 2024
3027488
Add news entry
ZeroIntensity Jun 29, 2024
11cdb6b
Remove artifact
ZeroIntensity Jun 29, 2024
b8a2936
Remove extra ZipFile() open
ZeroIntensity Jun 29, 2024
518d952
Fix backwards compatibility with old rpartition() style
ZeroIntensity Jun 29, 2024
f5d85a5
Fix typo in new unit test
ZeroIntensity Jun 29, 2024
a9c8e28
Add backwards compatibility with namespace packages
ZeroIntensity Jun 29, 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
Add backwards compatibility with namespace packages
  • Loading branch information
@ZeroIntensity
ZeroIntensity committed Jun 29, 2024
commit a9c8e28827a3e1aef40628bc222f6f6e7eff533f
2 changes: 1 addition & 1 deletion Lib/zipimport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ def _get_module_path(self, fullname):
# Originally, this *only* used rpartition('.')[2] to find
# the last item in a namespace package, but that made it basically
# impossible to use nested submodules.
for suffix, _, _ in _zip_searchorder:
for suffix, _, _ in [*_zip_searchorder, (path_sep, False, False)]:
if (path + suffix) in self._get_files():
# OK, we found it the old way. Let's return it.
return path
Expand Down