From 7914efe6b232d440413864c745dd6a0feae00d57 Mon Sep 17 00:00:00 2001 From: Felix Date: Wed, 20 Mar 2024 16:48:26 +0100 Subject: [PATCH 1/3] gh-117084: Fix zip extraction bug On Windows a directory is ending in \\ and not /. --- Lib/zipfile/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/zipfile/__init__.py b/Lib/zipfile/__init__.py index cc08f602fe44e0..a93ea8901269e4 100644 --- a/Lib/zipfile/__init__.py +++ b/Lib/zipfile/__init__.py @@ -605,7 +605,7 @@ def from_file(cls, filename, arcname=None, *, strict_timestamps=True): def is_dir(self): """Return True if this archive member is a directory.""" - return self.filename.endswith('/') + return self.filename.endswith('/') or self.filename.endswith('\\') # ZIP encryption uses the CRC32 one-byte primitive for scrambling some From 4430b29b5571ef295e4c5fb115feea5678ea69b0 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Wed, 20 Mar 2024 15:54:26 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2024-03-20-15-54-25.gh-issue-117084.uj1NbR.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2024-03-20-15-54-25.gh-issue-117084.uj1NbR.rst diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-03-20-15-54-25.gh-issue-117084.uj1NbR.rst b/Misc/NEWS.d/next/Core and Builtins/2024-03-20-15-54-25.gh-issue-117084.uj1NbR.rst new file mode 100644 index 00000000000000..5e9f67fec13eb8 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2024-03-20-15-54-25.gh-issue-117084.uj1NbR.rst @@ -0,0 +1 @@ +Fix extraction of ZIP files created on windows From 6360789ce936f8dd2f273eaa85f98fb15e797c6b Mon Sep 17 00:00:00 2001 From: Felix Date: Wed, 20 Mar 2024 17:17:30 +0100 Subject: [PATCH 3/3] Update Misc/NEWS.d/next/Core and Builtins/2024-03-20-15-54-25.gh-issue-117084.uj1NbR.rst Co-authored-by: Timo Furrer --- .../2024-03-20-15-54-25.gh-issue-117084.uj1NbR.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-03-20-15-54-25.gh-issue-117084.uj1NbR.rst b/Misc/NEWS.d/next/Core and Builtins/2024-03-20-15-54-25.gh-issue-117084.uj1NbR.rst index 5e9f67fec13eb8..58780b19259118 100644 --- a/Misc/NEWS.d/next/Core and Builtins/2024-03-20-15-54-25.gh-issue-117084.uj1NbR.rst +++ b/Misc/NEWS.d/next/Core and Builtins/2024-03-20-15-54-25.gh-issue-117084.uj1NbR.rst @@ -1 +1 @@ -Fix extraction of ZIP files created on windows +Fix extraction of zip files created on Windows