[3.11] gh-101566: Sync with zipp 3.14. (GH-102018). (GH-102090)

(cherry picked from commit 36854bbb240e417c0df6f0014924fcc899388186)

Backport of bugfix only.

Automerge-Triggered-By: GH:jaraco

diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index da4ddb916f8c2b5a7fe6d7316a5d9d54156a2211..ffb954659e420bb14dc022f5397b00ccb5bfde22 100644 (file)
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -3339,6 +3339,17 @@ with zipfile.ZipFile(io.BytesIO(), "w") as zf:
             file = cls(alpharep).joinpath('some dir').parent
             assert isinstance(file, cls)
 
+    @pass_alpharep
+    def test_extract_orig_with_implied_dirs(self, alpharep):
+        """
+        A zip file wrapped in a Path should extract even with implied dirs.
+        """
+        source_path = self.zipfile_ondisk(alpharep)
+        zf = zipfile.ZipFile(source_path)
+        # wrap the zipfile for its side effect
+        zipfile.Path(zf)
+        zf.extractall(source_path.parent)
+
 
 class EncodedMetadataTests(unittest.TestCase):
     file_names = ['\u4e00', '\u4e8c', '\u4e09']  # Han 'one', 'two', 'three'

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index a0b29e25a3cc03e75615596e7efb542a67f704ab..f14a638d40c5a3bbf079ee6d2b0994d12141b047 100644 (file)
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -2250,6 +2250,17 @@ class CompleteDirs(ZipFile):
         dir_match = name not in names and dirname in names
         return dirname if dir_match else name
 
+    def getinfo(self, name):
+        """
+        Supplement getinfo for implied dirs.
+        """
+        try:
+            return super().getinfo(name)
+        except KeyError:
+            if not name.endswith('/') or name not in self._name_set():
+                raise
+            return ZipInfo(filename=name)
+
     @classmethod
     def make(cls, source):
         """

diff --git a/Misc/NEWS.d/next/Library/2023-02-17-20-24-15.gh-issue-101566.FjgWBt.rst b/Misc/NEWS.d/next/Library/2023-02-17-20-24-15.gh-issue-101566.FjgWBt.rst
new file mode 100644 (file)
index 0000000..f0c0c24
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-02-17-20-24-15.gh-issue-101566.FjgWBt.rst
@@ -0,0 +1,3 @@
+In zipfile, apply
+fix for extractall on the underlying zipfile after being wrapped in
+``Path``.