Skip to content
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

Jump to bottom

[3.10] gh-123693: Use platform-agnostic semantics when processing zipfile.Path.name. #123694

Merged
merged 10 commits into from
Sep 5, 2024
Merged

[3.10] gh-123693: Use platform-agnostic semantics when processing zipfile.Path.name. #123694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c94488e
[3.10] [3.11] gh-123270: Replaced SanitizedNames with a more surgical…
jaraco Aug 27, 2024
87ac08d
Add some context to the assertion for troubleshooting.
jaraco Sep 2, 2024
d1eca1e
Remove tests not relevant to the backported security fix.
jaraco Sep 2, 2024
d5c243c
Restore the slash-prefixed paths in the malformed_paths test.
jaraco Sep 2, 2024
ee0d35f
Revert "Remove tests not relevant to the backported security fix."
jaraco Sep 4, 2024
45a7927
Skip failing tests, known to fail, referencing tracking bug.
jaraco Sep 4, 2024
7990bf9
[3.10] gh-123693: When computing the zipfile.Path.name, use PurePosix…
jaraco Sep 4, 2024
9f1dac0
Remove unused import
jaraco Sep 4, 2024
d7d5cad
Merge branch '3.10' into gh-123693/platform-agnostic-name
jaraco Sep 4, 2024
0df599f
Remove unused import
jaraco Sep 4, 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
3 changes: 0 additions & 3 deletions Lib/test/test_zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import itertools
import os
import pathlib
import platform
import posixpath
import string
import struct
Expand Down Expand Up @@ -3299,7 +3298,6 @@ def test_malformed_paths(self):
assert list(map(str, root.iterdir())) == ['../']
assert root.joinpath('..').joinpath('parent.txt').read_bytes() == b'content'

@unittest.skipIf(platform.system() == "Windows", "GH-123693")
def test_unsupported_names(self):
"""
Path segments with special characters are readable.
Expand All @@ -3320,7 +3318,6 @@ def test_unsupported_names(self):
assert item.name == 'V: NMS.flac', item.name
assert root.joinpath('V: NMS.flac').read_bytes() == b"fLaC..."

@unittest.skipIf(platform.system() == "Windows", "GH-123693")
def test_backslash_not_separator(self):
"""
In a zip file, backslashes are not separators.
Expand Down
2 changes: 1 addition & 1 deletion Lib/zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2387,7 +2387,7 @@ def open(self, mode='r', *args, pwd=None, **kwargs):

@property
def name(self):
return pathlib.Path(self.at).name or self.filename.name
return pathlib.PurePosixPath(self.at).name or self.filename.name

@property
def filename(self):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2024-09-04-14-05-02.gh-issue-123693.dNW1IF.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use platform-agnostic behavior when computing ``zipfile.Path.name``.
Loading