Merge branch 'main' into gh-100479-add-makepath

python · barneygale · May 5, 2023 · Nov 20, 2022 · Dec 24, 2022 · Dec 24, 2022
commit dcfe70a40226ac58d396fb80387348268335448a
@@ -303,13 +303,13 @@ def _load_parts(self):
        self._root = root
        self._tail_cached = tail

-    def _from_parsed_parts(self, drv, root, parts):
-        path_str = self._format_parsed_parts(drv, root, parts)
+    def _from_parsed_parts(self, drv, root, tail):
+        path_str = self._format_parsed_parts(drv, root, tail)
        path = self.makepath(path_str)
        path._str = path_str or '.'
        path._drv = drv
        path._root = root
-        path._parts_cached = parts
+        path._tail_cached = tail
        return path

    @classmethod
@@ -552,7 +552,7 @@ def relative_to(self, other, /, *_deprecated, walk_up=False):
            raise ValueError(f"{str(self)!r} and {str(other)!r} have different anchors")
        if step and not walk_up:
            raise ValueError(f"{str(self)!r} is not in the subpath of {str(other)!r}")
-        parts = ('..',) * step + self.parts[len(path.parts):]
+        parts = ['..'] * step + self._tail[len(path._tail):]
        return self.makepath(*parts)

    def is_relative_to(self, other, /, *_deprecated):
@@ -608,8 +608,8 @@ def parent(self):
        """The logical parent of the path."""
        drv = self.drive
        root = self.root
-        parts = self._parts
-        if len(parts) == bool(drv or root):
+        tail = self._tail
+        if not tail:
            return self
        return self._from_parsed_parts(drv, root, tail[:-1])

@@ -618,10 +618,10 @@ def parents(self):
        """A tuple of this path's logical parents."""
        drv = self.drive
        root = self.root
-        parts = self._parts
+        tail = self._tail
        return tuple(
-            self._from_parsed_parts(drv, root, parts[:idx])
-            for idx in reversed(range(bool(drv or root), len(parts))))
+            self._from_parsed_parts(drv, root, tail[:idx])
+            for idx in reversed(range(len(tail))))

    def is_absolute(self):
        """True if the path is absolute (has both a root and, if applicable,
@@ -651,7 +651,7 @@ def match(self, path_pattern):
        """
        Return True if this path matches the given pattern.
        """
-        pat = type(self)(path_pattern)
+        pat = self.makepath(path_pattern)
        if not pat.parts:
            raise ValueError("empty pattern")
        pat_parts = pat._parts_normcase
@@ -726,7 +726,7 @@ def _make_child_relpath(self, name):
            path_str = f'{path_str}{name}'
        else:
            path_str = name
-        path = type(self)(path_str)
+        path = self.makepath(path_str)
        path._str = path_str
        path._drv = self.drive
        path._root = self.root