bpo-37520: Correct behavior for zipfile.Path.parent (GH-14638) (GH-14641)

* bpo-37520: Correct behavior for zipfile.Path.parent

* 📜🤖 Added by blurb_it.
(cherry picked from commit 38f44b4)

Co-authored-by: Jason R. Coombs <[email protected]>

Author: miss-islington

Lib/test/test_zipfile.py

@@ -2514,5 +2514,16 @@ def test_parent(self):
             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()

Lib/zipfile.py

@@ -2236,7 +2236,7 @@ def _add_implied_dirs(names):
 
     @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)

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.