Skip to content

Commit

Permalink
[3.11] gh-101566: Sync with zipp 3.14. (GH-102018). (GH-102090)
Browse files Browse the repository at this point in the history
(cherry picked from commit 36854bb)

Backport of bugfix only.

Automerge-Triggered-By: GH:jaraco
  • Loading branch information
jaraco authored Feb 20, 2023
1 parent 62c0327 commit d15e958
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 0 deletions.
11 changes: 11 additions & 0 deletions Lib/test/test_zipfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -3339,6 +3339,17 @@ def test_inheritance(self, alpharep):
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'
Expand Down
11 changes: 11 additions & 0 deletions Lib/zipfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -2250,6 +2250,17 @@ def resolve_dir(self, name):
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):
"""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
In zipfile, apply
fix for extractall on the underlying zipfile after being wrapped in
``Path``.

0 comments on commit d15e958

Please sign in to comment.