From a55020ed83acc21c8e303d0a920c36d9f9f0ccd8 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Jul 2023 09:21:17 -0400
Subject: [PATCH 1/3] gh-106752: Sync with zipp 3.16.2 (#106757)

* gh-106752: Sync with zipp 3.16.2

* Add blurb

(cherry picked from commit 22980dc7c9dcec4b74fea815542601ef582c230e)
---
 Lib/test/test_zipfile.py                              |  9 +++++++++
 Lib/zipfile.py                                        | 11 +++++++----
 .../2023-07-14-16-54-13.gh-issue-106752.BT1Yxw.rst    |  5 +++++
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2023-07-14-16-54-13.gh-issue-106752.BT1Yxw.rst

diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index bb2c24c8c50c58..c8e0159765ec2c 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -3443,6 +3443,13 @@ def test_suffixes(self, alpharep):
         e = root / '.hgrc'
         assert e.suffixes == []
 
+    @pass_alpharep
+    def test_suffix_no_filename(self, alpharep):
+        alpharep.filename = None
+        root = zipfile.Path(alpharep)
+        assert root.joinpath('example').suffix == ""
+        assert root.joinpath('example').suffixes == []
+
     @pass_alpharep
     def test_stem(self, alpharep):
         """
@@ -3460,6 +3467,8 @@ def test_stem(self, alpharep):
         d = root / "d"
         assert d.stem == "d"
 
+        assert (root / ".gitignore").stem == ".gitignore"
+
     @pass_alpharep
     def test_root_parent(self, alpharep):
         root = zipfile.Path(alpharep)
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 1dec6a8b97bc4f..6189db5e3e420d 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -2420,21 +2420,24 @@ def open(self, mode='r', *args, pwd=None, **kwargs):
         encoding, args, kwargs = _extract_text_encoding(*args, **kwargs)
         return io.TextIOWrapper(stream, encoding, *args, **kwargs)
 
+    def _base(self):
+        return pathlib.PurePosixPath(self.at or self.root.filename)
+
     @property
     def name(self):
-        return pathlib.Path(self.at).name or self.filename.name
+        return self._base().name
 
     @property
     def suffix(self):
-        return pathlib.Path(self.at).suffix or self.filename.suffix
+        return self._base().suffix
 
     @property
     def suffixes(self):
-        return pathlib.Path(self.at).suffixes or self.filename.suffixes
+        return self._base().suffixes
 
     @property
     def stem(self):
-        return pathlib.Path(self.at).stem or self.filename.stem
+        return self._base().stem
 
     @property
     def filename(self):
diff --git a/Misc/NEWS.d/next/Library/2023-07-14-16-54-13.gh-issue-106752.BT1Yxw.rst b/Misc/NEWS.d/next/Library/2023-07-14-16-54-13.gh-issue-106752.BT1Yxw.rst
new file mode 100644
index 00000000000000..bbc53d76decbc3
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-07-14-16-54-13.gh-issue-106752.BT1Yxw.rst
@@ -0,0 +1,5 @@
+Fixed several bugs in zipfile.Path, including: in ``Path.match`, Windows
+separators are no longer honored (and never were meant to be); Fixed
+``name``/``suffix``/``suffixes``/``stem`` operations when no filename is
+present and the Path is not at the root of the zipfile; Reworked glob for
+performance and more correct matching behavior.

From f4205341b085a95c9418a3dcf62919afe81cf4d0 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Jul 2023 09:34:56 -0400
Subject: [PATCH 2/3] [3.11] gh-106752: Sync with zipp 3.16.2 (GH-106757)

* gh-106752: Sync with zipp 3.16.2

* Add blurb.
(cherry picked from commit 22980dc7c9dcec4b74fea815542601ef582c230e)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>

From 9e279f851584c45cf734953a5c0334ac8849e148 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Sat, 15 Jul 2023 09:37:39 -0400
Subject: [PATCH 3/3] Remove Python 3.12 concerns from changelog.

---
 .../Library/2023-07-14-16-54-13.gh-issue-106752.BT1Yxw.rst  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Misc/NEWS.d/next/Library/2023-07-14-16-54-13.gh-issue-106752.BT1Yxw.rst b/Misc/NEWS.d/next/Library/2023-07-14-16-54-13.gh-issue-106752.BT1Yxw.rst
index bbc53d76decbc3..d36c97da49d1b8 100644
--- a/Misc/NEWS.d/next/Library/2023-07-14-16-54-13.gh-issue-106752.BT1Yxw.rst
+++ b/Misc/NEWS.d/next/Library/2023-07-14-16-54-13.gh-issue-106752.BT1Yxw.rst
@@ -1,5 +1,3 @@
-Fixed several bugs in zipfile.Path, including: in ``Path.match`, Windows
-separators are no longer honored (and never were meant to be); Fixed
+Fixed several bug in zipfile.Path in
 ``name``/``suffix``/``suffixes``/``stem`` operations when no filename is
-present and the Path is not at the root of the zipfile; Reworked glob for
-performance and more correct matching behavior.
+present and the Path is not at the root of the zipfile.