Merge pull request #135 from barneygale/fix-134

jaraco · web-flow · commit 0c7638af5f0e · 2025-08-18T13:09:01.000-07:00
Fix `TypeError` from `str(Path(...))`
diff --git a/newsfragments/134.bugfix.rst b/newsfragments/134.bugfix.rst
@@ -0,0 +1 @@
+``str(Path(...))`` now renders ":zipfile" for the filename when a zipfile has no filename instead of failing with a TypeError.
diff --git a/tests/test_path.py b/tests/test_path.py
@@ -346,6 +346,19 @@ class Subclass(zipfile.Path):
         root = Subclass(alpharep)
         assert isinstance(root / 'b', Subclass)
 
+    def test_at(self):
+        root = zipfile.Path(zipfile.ZipFile(io.BytesIO(), 'w'))
+        assert root.at == ''
+        assert (root / 'foo' / 'bar').at == 'foo/bar'
+
+    def test_str(self):
+        """
+        An unnamed zip file is indicated by ":zipfile:"
+        """
+        root = zipfile.Path(zipfile.ZipFile(io.BytesIO(), 'w'))
+        assert str(root) == ':zipfile:'
+        assert str(root / 'foo' / 'bar') == ':zipfile:/foo/bar'
+
     @pass_alpharep
     def test_filename(self, alpharep):
         root = zipfile.Path(alpharep)
diff --git a/zipp/__init__.py b/zipp/__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 .compat.py310 import text_encoding
 from .glob import Translator
 
@@ -277,7 +277,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')
@@ -435,7 +435,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)
diff --git a/zipp/_functools.py b/zipp/_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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+``str(Path(...))`` now renders ":zipfile" for the filename when a zipfile has no filename instead of failing with a TypeError.