mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

gh-94018: Remove trailing spaces in _sanitize_windows_name (GH-94040)

Browse source 
Closes #94018.

Co-authored-by: Sam Ezeh <sam.z.ezeh@gmail.com>
Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
This commit is contained in:
Robin Plumey 2022-06-28 12:09:22 +02:00 • committed by GitHub
parent 81ac9ac492
commit 176fd5571f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_zipfile.py
View file

@ -1440,6 +1440,8 @@ class ExtractTests(unittest.TestCase):
self.assertEqual(san(r',,?,C:,foo,bar/z', ','), r'_,C_,foo,bar/z') 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(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')
self.assertEqual(san(' . /. /foo ./ . /. ./ba .r', '/'), r'foo/ba .r')
def test_extract_hackers_arcnames_common_cases(self): def test_extract_hackers_arcnames_common_cases(self):
common_hacknames = [ common_hacknames = [

4
Lib/zipfile.py
View file

@ -1685,8 +1685,8 @@ class ZipFile:
table = str.maketrans(illegal, '_' * len(illegal)) table = str.maketrans(illegal, '_' * len(illegal))
cls._windows_illegal_name_trans_table = table cls._windows_illegal_name_trans_table = table
arcname = arcname.translate(table) arcname = arcname.translate(table)
# remove trailing dots # remove trailing dots and spaces
arcname = (x.rstrip('.') for x in arcname.split(pathsep)) arcname = (x.rstrip(' .') for x in arcname.split(pathsep))
# rejoin, removing empty parts. # rejoin, removing empty parts.
arcname = pathsep.join(x for x in arcname if x) arcname = pathsep.join(x for x in arcname if x)
return arcname return arcname

1
Misc/NEWS.d/next/Windows/2022-06-20-22-32-14.gh-issue-94018.bycC3A.rst Normal file
View file

@ -0,0 +1 @@
:mod:`zipfile` will now remove trailing spaces from path components when extracting files on Windows.