From 38f44b4a4adc37e8f5f8971917d8b3145f351a56 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sun, 7 Jul 2019 17:37:50 -0400
Subject: [PATCH] bpo-37520: Correct behavior for zipfile.Path.parent
 (GH-14638)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

* 📜🤖 Added by blurb_it.
---
 Lib/test/test_zipfile.py                              | 11 +++++++++++
 Lib/zipfile.py                                        |  2 +-
 .../Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst  |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 Misc/NEWS.d/next/Library/2019-07-07-21-09-08.bpo-37520.Gg0KD6.rst

diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index 19b550f80187ea..0c8ffcdbf14afe 100644
--- a/Lib/test/test_zipfile.py
+++ b/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()
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 62f2fd27d3ce6f..3c1f1235034a9e 100644
--- a/Lib/zipfile.py
+++ b/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)
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 00000000000000..6584d3ebe1ed8c
--- /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