GH-128520: pathlib ABCs: tweak protocol for virtual path strings (#134104)

Adjust `pathlib._os.vfspath()` so that it doesn't try `os.fsdecode()`. I
don't know that supporting `os.PathLike` arguments is a good idea, so
it's best to leave it out for now.

diff --git a/Lib/pathlib/__init__.py b/Lib/pathlib/__init__.py
index fd073445e89b62a4b97aea3ffcf072596ad5ccad..cea1a9fe57eedf237e9f8ec4127acd14baf84880 100644 (file)
--- a/Lib/pathlib/__init__.py
+++ b/Lib/pathlib/__init__.py
@@ -188,9 +188,6 @@ class PurePath:
     def __repr__(self):
         return "{}({!r})".format(self.__class__.__name__, self.as_posix())
 
-    def __fspath__(self):
-        return str(self)
-
     def __bytes__(self):
         """Return the bytes representation of the path.  This is only
         recommended to use under Unix."""
@@ -259,6 +256,9 @@ class PurePath:
                                                   self._tail) or '.'
             return self._str
 
+    __fspath__ = __str__
+    __vfspath__ = __str__
+
     @classmethod
     def _format_parsed_parts(cls, drv, root, tail):
         if drv or root:

diff --git a/Lib/pathlib/_os.py b/Lib/pathlib/_os.py
index 62a4adb555ea89b1124489107a5584ac26ac6b4b..fbcbfb979d1278f0aa0842a03b81a87e3307383b 100644 (file)
--- a/Lib/pathlib/_os.py
+++ b/Lib/pathlib/_os.py
@@ -210,24 +210,18 @@ def magic_open(path, mode='r', buffering=-1, encoding=None, errors=None,
     raise TypeError(f"{cls.__name__} can't be opened with mode {mode!r}")
 
 
-def vfspath(path):
+def vfspath(obj):
     """
     Return the string representation of a virtual path object.
     """
+    cls = type(obj)
     try:
-        return os.fsdecode(path)
-    except TypeError:
-        pass
-
-    path_type = type(path)
-    try:
-        return path_type.__vfspath__(path)
+        vfspath_method = cls.__vfspath__
     except AttributeError:
-        if hasattr(path_type, '__vfspath__'):
-            raise
-
-    raise TypeError("expected str, bytes, os.PathLike or JoinablePath "
-                    "object, not " + path_type.__name__)
+        cls_name = cls.__name__
+        raise TypeError(f"expected JoinablePath object, not {cls_name}") from None
+    else:
+        return vfspath_method(obj)
 
 
 def ensure_distinct_paths(source, target):

diff --git a/Lib/test/test_pathlib/support/zip_path.py b/Lib/test/test_pathlib/support/zip_path.py
index 21e1d07423aff514e952d9836c4284d80bd4f019..2bfe89b36595b0e0422fde8fdb228fbb2b1d7508 100644 (file)
--- a/Lib/test/test_pathlib/support/zip_path.py
+++ b/Lib/test/test_pathlib/support/zip_path.py
@@ -334,4 +334,4 @@ class WritableZipPath(_WritablePath):
         zinfo.external_attr = stat.S_IFLNK << 16
         if target_is_directory:
             zinfo.external_attr |= 0x10
-        self.zip_file.writestr(zinfo, vfspath(target))
+        self.zip_file.writestr(zinfo, target)