diff options
| -rw-r--r-- | Lib/test/test_zipfile.py | 11 | ||||
| -rw-r--r-- | Lib/zipfile.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst | 1 |
3 files changed, 13 insertions, 1 deletions
diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py index 19b550f..0c8ffcd 100644 --- a/Lib/test/test_zipfile.py +++ b/Lib/test/test_zipfile.py @@ -2514,5 +2514,16 @@ class TestPath(unittest.TestCase): assert (root / 'a').parent.at == '' assert (root / 'a' / 'b').parent.at == 'a/' + def test_dir_parent(self): + for zipfile_abcde in self.zipfile_abcde(): + root = zipfile.Path(zipfile_abcde) + assert (root / 'b').parent.at == '' + assert (root / 'b/').parent.at == '' + + def test_missing_dir_parent(self): + for zipfile_abcde in self.zipfile_abcde(): + root = zipfile.Path(zipfile_abcde) + assert (root / 'missing dir/').parent.at == '' + if __name__ == "__main__": unittest.main() diff --git a/Lib/zipfile.py b/Lib/zipfile.py index 62f2fd2..3c1f123 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -2236,7 +2236,7 @@ class Path: @property def parent(self): - parent_at = posixpath.dirname(self.at) + parent_at = posixpath.dirname(self.at.rstrip('/')) if parent_at: parent_at += '/' return self._next(parent_at) diff --git a/Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst b/Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst new file mode 100644 index 0000000..6584d3e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst @@ -0,0 +1 @@ +Correct behavior for zipfile.Path.parent when the path object identifies a subdirectory.
\ No newline at end of file |