Skip to content

gh-94018: Remove trailing spaces in _sanitize_windows_name #94040

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 10 commits into from
Jun 28, 2022
Merged

gh-94018: Remove trailing spaces in _sanitize_windows_name #94040

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
d1fe859
hg-94018: Remove trailing spaces in _sanitize_windows_name
Rygone Jun 20, 2022
ef6e34f
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 20, 2022
65777a1
Update 2022-06-20-22-32-14.gh-issue-94018.bycC3A.rst
Rygone Jun 20, 2022
29f57ee
Update Misc/NEWS.d/next/Windows/2022-06-20-22-32-14.gh-issue-94018.by…
Rygone Jun 20, 2022
1b35fc1
Update Misc/NEWS.d/next/Windows/2022-06-20-22-32-14.gh-issue-94018.by…
Rygone Jun 21, 2022
ba39a9b
Update test_zipfile.py
Rygone Jun 23, 2022
46dc0a3
Merge branch 'main' into patch-1
Rygone Jun 23, 2022
2a2e53e
Update Misc/NEWS.d/next/Windows/2022-06-20-22-32-14.gh-issue-94018.by…
Rygone Jun 23, 2022
961d242
Merge branch 'main' into patch-1
Rygone Jun 23, 2022
a7817ea
Merge branch 'main' into patch-1
Rygone Jun 28, 2022
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
2 changes: 2 additions & 0 deletions Lib/test/test_zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1440,6 +1440,8 @@ def test_sanitize_windows_name(self):
self.assertEqual(san(r',,?,C:,foo,bar/z', ','), r'_,C_,foo,bar/z')
self.assertEqual(san(r'a\b,c<d>e|f"g?h*i', ','), r'a\b,c_d_e_f_g_h_i')
self.assertEqual(san('../../foo../../ba..r', '/'), r'foo/ba..r')
self.assertEqual(san(' / /foo / /ba r', '/'), r'foo/ba r')
self.assertEqual(san(' . /. /foo ./ . /. ./ba .r', '/'), r'foo/ba .r')

def test_extract_hackers_arcnames_common_cases(self):
common_hacknames = [
Expand Down
4 changes: 2 additions & 2 deletions Lib/zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1685,8 +1685,8 @@ def _sanitize_windows_name(cls, arcname, pathsep):
table = str.maketrans(illegal, '_' * len(illegal))
cls._windows_illegal_name_trans_table = table
arcname = arcname.translate(table)
# remove trailing dots
arcname = (x.rstrip('.') for x in arcname.split(pathsep))
# remove trailing dots and spaces
arcname = (x.rstrip(' .') for x in arcname.split(pathsep))
# rejoin, removing empty parts.
arcname = pathsep.join(x for x in arcname if x)
return arcname
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2022-06-20-22-32-14.gh-issue-94018.bycC3A.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
:mod:`zipfile` will now remove trailing spaces from path components when extracting files on Windows.