[3.15] gh-100609: Render an unnamed zipfile as ":zipfile:" in zipfile.Path (GH-160103) (#160118)

gh-100609: Render an unnamed zipfile as ":zipfile:" in `zipfile.Path` (GH-160103)

Synchronizes the fix from zipp 3.23.1. `str()` of a `zipfile.Path` whose
zipfile has no filename previously raised `TypeError`.
(cherry picked from commit ba96fab)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>

Author: 3 people

Lib/test/test_zipfile/_path/test_path.py

@@ -351,6 +351,21 @@ class Subclass(zipfile.Path):
         root = Subclass(alpharep)
         assert isinstance(root / 'b', Subclass)
 
+    def test_at(self):
+        zip_file = self.enterContext(zipfile.ZipFile(io.BytesIO(), 'w'))
+        root = zipfile.Path(zip_file)
+        assert root.at == ''
+        assert (root / 'foo' / 'bar').at == 'foo/bar'
+
+    def test_str(self):
+        """
+        An unnamed zip file is indicated by ":zipfile:"
+        """
+        zip_file = self.enterContext(zipfile.ZipFile(io.BytesIO(), 'w'))
+        root = zipfile.Path(zip_file)
+        assert str(root) == ':zipfile:'
+        assert str(root / 'foo' / 'bar') == ':zipfile:/foo/bar'
+
     @pass_alpharep
     def test_filename(self, alpharep):
         root = zipfile.Path(alpharep)

Lib/zipfile/_path/__init__.py

@@ -17,7 +17,7 @@
 import sys
 import zipfile
 
-from ._functools import save_method_args
+from ._functools import none_as, save_method_args
 from .glob import Translator
 
 __all__ = ['Path']
@@ -276,7 +276,7 @@ class Path:
     resolve to the zipfile.
 
     >>> str(path)
-    'mem/abcde.zip/'
+    'mem/abcde.zip'
     >>> path.name
     'abcde.zip'
     >>> path.filename == pathlib.Path('mem/abcde.zip')
@@ -434,7 +434,8 @@ def relative_to(self, other, *extra):
         return posixpath.relpath(str(self), str(other.joinpath(*extra)))
 
     def __str__(self):
-        return posixpath.join(self.root.filename, self.at)
+        root = none_as(self.root.filename, ':zipfile:')
+        return posixpath.join(root, self.at) if self.at else root
 
     def __repr__(self):
         return self.__repr.format(self=self)

Lib/zipfile/_path/_functools.py

@@ -18,3 +18,14 @@ def wrapper(self, /, *args, **kwargs):
         return method(self, *args, **kwargs)
 
     return wrapper
+
+
+# from jaraco.functools 4.3
+def none_as(value, replacement=None):
+    """
+    >>> none_as(None, 'foo')
+    'foo'
+    >>> none_as('bar', 'foo')
+    'bar'
+    """
+    return replacement if value is None else value

Misc/NEWS.d/next/Library/2026-10-21-19-40-00.gh-issue-100609.THXgRC.rst

@@ -0,0 +1,5 @@
+``str()`` of a :class:`zipfile.Path` whose underlying zipfile has no
+filename, such as one constructed from an :class:`io.BytesIO`, now renders
+that filename as ``:zipfile:`` instead of raising :exc:`TypeError`. The root
+of a zipfile is also no longer rendered with a trailing slash. Synchronized
+with :pypi:`zipp` 3.23.1.