Look up __newpath__ on path type.

python · barneygale · May 5, 2023 · Nov 20, 2022 · Dec 24, 2022 · Dec 24, 2022
commit cdedc926aa4ad6e7031a4520047ae22a99a83a64
@@ -342,7 +342,7 @@ def _load_parts(self):

    def _from_parsed_parts(self, drv, root, tail):
        path_str = self._format_parsed_parts(drv, root, tail)
-        path = self.__newpath__(path_str)
+        path = type(self).__newpath__(self, path_str)
        path._str = path_str or '.'
        path._drv = drv
        path._root = root
@@ -581,7 +581,8 @@ def relative_to(self, other, /, *_deprecated, walk_up=False):
                   "scheduled for removal in Python {remove}")
            warnings._deprecated("pathlib.PurePath.relative_to(*args)", msg,
                                 remove=(3, 14))
-        other = self.__newpath__(other, *_deprecated)
+        path_cls = type(self)
+        other = path_cls.__newpath__(self, other, *_deprecated)
        for step, path in enumerate([other] + list(other.parents)):
            if self.is_relative_to(path):
                break
@@ -590,7 +591,7 @@ def relative_to(self, other, /, *_deprecated, walk_up=False):
        if step and not walk_up:
            raise ValueError(f"{str(self)!r} is not in the subpath of {str(other)!r}")
        parts = ['..'] * step + self._tail[len(path._tail):]
-        return self.__newpath__(*parts)
+        return path_cls.__newpath__(self, *parts)

    def is_relative_to(self, other, /, *_deprecated):
        """Return True if the path is relative to another path or False.
@@ -601,7 +602,7 @@ def is_relative_to(self, other, /, *_deprecated):
                   "scheduled for removal in Python {remove}")
            warnings._deprecated("pathlib.PurePath.is_relative_to(*args)",
                                 msg, remove=(3, 14))
-        other = self.__newpath__(other, *_deprecated)
+        other = type(self).__newpath__(self, other, *_deprecated)
        return other == self or other in self.parents

    @property
@@ -619,7 +620,7 @@ def joinpath(self, *pathsegments):
        paths) or a totally different path (if one of the arguments is
        anchored).
        """
-        return self.__newpath__(self._raw_path, *pathsegments)
+        return type(self).__newpath__(self, self._raw_path, *pathsegments)

    def __truediv__(self, key):
        try:
@@ -629,7 +630,7 @@ def __truediv__(self, key):

    def __rtruediv__(self, key):
        try:
-            return self.__newpath__(key, self._raw_path)
+            return type(self).__newpath__(self, key, self._raw_path)
        except TypeError:
            return NotImplemented

@@ -678,7 +679,7 @@ def match(self, path_pattern):
        """
        Return True if this path matches the given pattern.
        """
-        pat = self.__newpath__(path_pattern)
+        pat = type(self).__newpath__(self, path_pattern)
        if not pat.parts:
            raise ValueError("empty pattern")
        pat_parts = pat._parts_normcase
@@ -753,7 +754,7 @@ def _make_child_relpath(self, name):
            path_str = f'{path_str}{name}'
        else:
            path_str = name
-        path = self.__newpath__(path_str)
+        path = type(self).__newpath__(self, path_str)
        path._str = path_str
        path._drv = self.drive
        path._root = self.root
@@ -803,7 +804,7 @@ def samefile(self, other_path):
        try:
            other_st = other_path.stat()
        except AttributeError:
-            other_st = self.__newpath__(other_path).stat()
+            other_st = type(self).__newpath__(self, other_path).stat()
        return self._flavour.samestat(st, other_st)

    def iterdir(self):
@@ -865,7 +866,7 @@ def absolute(self):
            cwd = self._flavour.abspath(self.drive)
        else:
            cwd = os.getcwd()
-        return self.__newpath__(cwd, self._raw_path)
+        return type(self).__newpath__(self, cwd, self._raw_path)

    def resolve(self, strict=False):
        """
@@ -883,7 +884,7 @@ def check_eloop(e):
        except OSError as e:
            check_eloop(e)
            raise
-        p = self.__newpath__(s)
+        p = type(self).__newpath__(self, s)

        # In non-strict mode, realpath() doesn't raise on symlink loops.
        # Ensure we get an exception by calling stat()
@@ -973,7 +974,7 @@ def readlink(self):
        """
        if not hasattr(os, "readlink"):
            raise NotImplementedError("os.readlink() not available on this system")
-        return self.__newpath__(os.readlink(self))
+        return type(self).__newpath__(self, os.readlink(self))

    def touch(self, mode=0o666, exist_ok=True):
        """
@@ -1062,7 +1063,7 @@ def rename(self, target):
        Returns the new Path instance pointing to the target path.
        """
        os.rename(self, target)
-        return self.__newpath__(target)
+        return type(self).__newpath__(self, target)

    def replace(self, target):
        """
@@ -1075,7 +1076,7 @@ def replace(self, target):
        Returns the new Path instance pointing to the target path.
        """
        os.replace(self, target)
-        return self.__newpath__(target)
+        return type(self).__newpath__(self, target)

    def symlink_to(self, target, target_is_directory=False):
        """