Skip to content

bpo-36832: Add support for .parent and .joinpath in zipfile.Path #13213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions Lib/test/test_zipfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -2481,6 +2481,14 @@ def test_read(self):
assert a.read_text() == "content of a"
assert a.read_bytes() == b"content of a"

def test_joinpath(self):
for zipfile_abcde in self.zipfile_abcde():
root = zipfile.Path(zipfile_abcde)
a = root.joinpath("a")
assert a.is_file()
e = root.joinpath("b").joinpath("d").joinpath("e.txt")
assert e.read_text() == "content of e"

def test_traverse_truediv(self):
for zipfile_abcde in self.zipfile_abcde():
root = zipfile.Path(zipfile_abcde)
Expand All @@ -2502,5 +2510,11 @@ def test_traverse_pathlike(self):
root = zipfile.Path(zipfile_abcde)
root / pathlib.Path("a")

def test_parent(self):
for zipfile_abcde in self.zipfile_abcde():
root = zipfile.Path(zipfile_abcde)
assert (root / 'a').parent.at == ''
assert (root / 'a' / 'b').parent.at == 'a/'

if __name__ == "__main__":
unittest.main()
11 changes: 10 additions & 1 deletion Lib/zipfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -2218,12 +2218,14 @@ def __str__(self):
def __repr__(self):
return self.__repr.format(self=self)

def __truediv__(self, add):
def joinpath(self, add):
next = posixpath.join(self.at, add)
next_dir = posixpath.join(self.at, add, "")
names = self._names()
return self._next(next_dir if next not in names and next_dir in names else next)

__truediv__ = joinpath

@staticmethod
def _add_implied_dirs(names):
return names + [
Expand All @@ -2232,6 +2234,13 @@ def _add_implied_dirs(names):
if name and name + "/" not in names
]

@property
def parent(self):
parent_at = posixpath.dirname(self.at)
if parent_at:
parent_at += '/'
return self._next(parent_at)

def _names(self):
return self._add_implied_dirs(self.root.namelist())

Expand Down