more more _sanitize_filename, this time zi.from_file

if a PathLike may be used as arcname.
gpshead · Dec 22, 2023 · 358ccbe · 358ccbe
1 parent eb7a1c4
commit 358ccbe
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Lib/zipfile/__init__.py b/Lib/zipfile/__init__.py
@@ -568,8 +568,10 @@ def from_file(cls, filename, arcname=None, *, strict_timestamps=True):
         """
         if isinstance(filename, os.PathLike):
             filename = os.fspath(filename)
-        if isinstance(arcname, os.PathLike):
-            arcname = os.fspath(arcname)
+            if arcname is None:
+                arcname = _sanitize_filename(filename)
+        elif isinstance(arcname, os.PathLike):
+            arcname = _sanitize_filename(os.fspath(arcname))
         st = os.stat(filename)
         isdir = stat.S_ISDIR(st.st_mode)
         mtime = time.localtime(st.st_mtime)