Merge branch 'main' into gh-110109-purepathbase

python · barneygale · Dec 8, 2023 · Oct 11, 2023 · Oct 28, 2023 · Oct 28, 2023
commit 6c742ed5f1a5a0116ff8913ceee9631b3d08a288
diff --git a/Lib/pathlib.py b/Lib/pathlib.py
@@ -513,8 +513,9 @@ 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))
-        if not isinstance(other, _PurePathBase) or _deprecated:
             other = self.with_segments(other, *_deprecated)
+        elif not isinstance(other, _PurePathBase):
+            other = self.with_segments(other)
         for step, path in enumerate([other] + list(other.parents)):
             if path == self or path in self.parents:
                 break
@@ -536,8 +537,9 @@ 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))
-        if not isinstance(other, _PurePathBase) or _deprecated:
             other = self.with_segments(other, *_deprecated)
+        elif not isinstance(other, _PurePathBase):
+            other = self.with_segments(other)
         return other == self or other in self.parents
 
     @property