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

Rygone · dignissimus · hauntsaninja · web-flow · commit 176fd5571f29 · 2022-06-28T12:09:22.000+02:00
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>
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
@@ -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 = [
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
@@ -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
diff --git a/Misc/NEWS.d/next/Windows/2022-06-20-22-32-14.gh-issue-94018.bycC3A.rst b/Misc/NEWS.d/next/Windows/2022-06-20-22-32-14.gh-issue-94018.bycC3A.rst
@@ -0,0 +1 @@
+:mod:`zipfile` will now remove trailing spaces from path components when extracting files on Windows.

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