summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBarney Gale <barney.gale@gmail.com>2024-12-29 22:07:12 (GMT)
committerGitHub <noreply@github.com>2024-12-29 22:07:12 (GMT)
commitef63cca494571f50906baae1d176469a3dcf8838 (patch)
tree1b9b86826bd40be1039855410ba54cb567c32070 /Lib
parentc78729f2df7c0e220f1080edb2a0d0cdd49e22df (diff)
downloadcpython-ef63cca494571f50906baae1d176469a3dcf8838.zip
cpython-ef63cca494571f50906baae1d176469a3dcf8838.tar.gz
cpython-ef63cca494571f50906baae1d176469a3dcf8838.tar.bz2
GH-127381: pathlib ABCs: remove uncommon `PurePathBase` methods (#127853)
Remove `PurePathBase.relative_to()` and `is_relative_to()` because they don't account for *other* being an entirely different kind of path, and they can't use `__eq__()` because it's not on the `PurePathBase` interface. Remove `PurePathBase.drive`, `root`, `is_absolute()` and `as_posix()`. These are all too specific to local filesystems.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/pathlib/_abc.py65
-rw-r--r--Lib/pathlib/_local.py5
-rw-r--r--Lib/pathlib/_types.py2
-rw-r--r--Lib/test/test_pathlib/test_pathlib.py356
-rw-r--r--Lib/test/test_pathlib/test_pathlib_abc.py370
5 files changed, 365 insertions, 433 deletions
diff --git a/Lib/pathlib/_abc.py b/Lib/pathlib/_abc.py
index 4d5f798..e6ff3fe 100644
--- a/Lib/pathlib/_abc.py
+++ b/Lib/pathlib/_abc.py
@@ -205,21 +205,6 @@ class PurePathBase:
passing to system calls."""
raise NotImplementedError
- def as_posix(self):
- """Return the string representation of the path with forward (/)
- slashes."""
- return str(self).replace(self.parser.sep, '/')
-
- @property
- def drive(self):
- """The drive prefix (letter or UNC path), if any."""
- return self.parser.splitdrive(self.anchor)[0]
-
- @property
- def root(self):
- """The root of the path, if any."""
- return self.parser.splitdrive(self.anchor)[1]
-
@property
def anchor(self):
"""The concatenation of the drive and root, or ''."""
@@ -291,51 +276,6 @@ class PurePathBase:
else:
return self.with_name(stem + suffix)
- def relative_to(self, other, *, walk_up=False):
- """Return the relative path to another path identified by the passed
- arguments. If the operation is not possible (because this is not
- related to the other path), raise ValueError.
-
- The *walk_up* parameter controls whether `..` may be used to resolve
- the path.
- """
- if not isinstance(other, PurePathBase):
- other = self.with_segments(other)
- anchor0, parts0 = _explode_path(self)
- anchor1, parts1 = _explode_path(other)
- if anchor0 != anchor1:
- raise ValueError(f"{str(self)!r} and {str(other)!r} have different anchors")
- while parts0 and parts1 and parts0[-1] == parts1[-1]:
- parts0.pop()
- parts1.pop()
- for part in parts1:
- if not part or part == '.':
- pass
- elif not walk_up:
- raise ValueError(f"{str(self)!r} is not in the subpath of {str(other)!r}")
- elif part == '..':
- raise ValueError(f"'..' segment in {str(other)!r} cannot be walked")
- else:
- parts0.append('..')
- return self.with_segments(*reversed(parts0))
-
- def is_relative_to(self, other):
- """Return True if the path is relative to another path or False.
- """
- if not isinstance(other, PurePathBase):
- other = self.with_segments(other)
- anchor0, parts0 = _explode_path(self)
- anchor1, parts1 = _explode_path(other)
- if anchor0 != anchor1:
- return False
- while parts0 and parts1 and parts0[-1] == parts1[-1]:
- parts0.pop()
- parts1.pop()
- for part in parts1:
- if part and part != '.':
- return False
- return True
-
@property
def parts(self):
"""An object providing sequence-like access to the
@@ -387,11 +327,6 @@ class PurePathBase:
parent = split(path)[0]
return tuple(parents)
- def is_absolute(self):
- """True if the path is absolute (has both a root and, if applicable,
- a drive)."""
- return self.parser.isabs(str(self))
-
def match(self, path_pattern, *, case_sensitive=None):
"""
Return True if this path matches the given pattern. If the pattern is
diff --git a/Lib/pathlib/_local.py b/Lib/pathlib/_local.py
index 4484d95..c5721a6 100644
--- a/Lib/pathlib/_local.py
+++ b/Lib/pathlib/_local.py
@@ -437,6 +437,11 @@ class PurePath(PurePathBase):
parts.append('')
return parts
+ def as_posix(self):
+ """Return the string representation of the path with forward (/)
+ slashes."""
+ return str(self).replace(self.parser.sep, '/')
+
@property
def _raw_path(self):
paths = self._raw_paths
diff --git a/Lib/pathlib/_types.py b/Lib/pathlib/_types.py
index baa4a7e..72dac2e 100644
--- a/Lib/pathlib/_types.py
+++ b/Lib/pathlib/_types.py
@@ -15,7 +15,5 @@ class Parser(Protocol):
sep: str
def split(self, path: str) -> tuple[str, str]: ...
- def splitdrive(self, path: str) -> tuple[str, str]: ...
def splitext(self, path: str) -> tuple[str, str]: ...
def normcase(self, path: str) -> str: ...
- def isabs(self, path: str) -> bool: ...
diff --git a/Lib/test/test_pathlib/test_pathlib.py b/Lib/test/test_pathlib/test_pathlib.py
index 0efa827..d13daf8 100644
--- a/Lib/test/test_pathlib/test_pathlib.py
+++ b/Lib/test/test_pathlib/test_pathlib.py
@@ -270,6 +270,12 @@ class PurePathTest(test_pathlib_abc.DummyPurePathTest):
P = self.cls
self.assertEqual(bytes(P('a/b')), b'a' + sep + b'b')
+ def test_as_posix_common(self):
+ P = self.cls
+ for pathstr in ('a', 'a/b', 'a/b/c', '/', '/a/b', '/a/b/c'):
+ self.assertEqual(P(pathstr).as_posix(), pathstr)
+ # Other tests for as_posix() are in test_equivalences().
+
def test_eq_common(self):
P = self.cls
self.assertEqual(P('a/b'), P('a/b'))
@@ -349,6 +355,51 @@ class PurePathTest(test_pathlib_abc.DummyPurePathTest):
self.assertEqual(q, p)
self.assertEqual(repr(q), r)
+ def test_drive_common(self):
+ P = self.cls
+ self.assertEqual(P('a/b').drive, '')
+ self.assertEqual(P('/a/b').drive, '')
+ self.assertEqual(P('').drive, '')
+
+ @needs_windows
+ def test_drive_windows(self):
+ P = self.cls
+ self.assertEqual(P('c:').drive, 'c:')
+ self.assertEqual(P('c:a/b').drive, 'c:')
+ self.assertEqual(P('c:/').drive, 'c:')
+ self.assertEqual(P('c:/a/b/').drive, 'c:')
+ self.assertEqual(P('//a/b').drive, '\\\\a\\b')
+ self.assertEqual(P('//a/b/').drive, '\\\\a\\b')
+ self.assertEqual(P('//a/b/c/d').drive, '\\\\a\\b')
+ self.assertEqual(P('./c:a').drive, '')
+
+
+ def test_root_common(self):
+ P = self.cls
+ sep = self.sep
+ self.assertEqual(P('').root, '')
+ self.assertEqual(P('a/b').root, '')
+ self.assertEqual(P('/').root, sep)
+ self.assertEqual(P('/a/b').root, sep)
+
+ @needs_posix
+ def test_root_posix(self):
+ P = self.cls
+ self.assertEqual(P('/a/b').root, '/')
+ # POSIX special case for two leading slashes.
+ self.assertEqual(P('//a/b').root, '//')
+
+ @needs_windows
+ def test_root_windows(self):
+ P = self.cls
+ self.assertEqual(P('c:').root, '')
+ self.assertEqual(P('c:a/b').root, '')
+ self.assertEqual(P('c:/').root, '\\')
+ self.assertEqual(P('c:/a/b/').root, '\\')
+ self.assertEqual(P('//a/b').root, '\\')
+ self.assertEqual(P('//a/b/').root, '\\')
+ self.assertEqual(P('//a/b/c/d').root, '\\')
+
def test_name_empty(self):
P = self.cls
self.assertEqual(P('').name, '')
@@ -547,6 +598,311 @@ class PurePathTest(test_pathlib_abc.DummyPurePathTest):
self.assertFalse(p < q)
self.assertFalse(p > q)
+ @needs_posix
+ def test_is_absolute_posix(self):
+ P = self.cls
+ self.assertFalse(P('').is_absolute())
+ self.assertFalse(P('a').is_absolute())
+ self.assertFalse(P('a/b/').is_absolute())
+ self.assertTrue(P('/').is_absolute())
+ self.assertTrue(P('/a').is_absolute())
+ self.assertTrue(P('/a/b/').is_absolute())
+ self.assertTrue(P('//a').is_absolute())
+ self.assertTrue(P('//a/b').is_absolute())
+
+ @needs_windows
+ def test_is_absolute_windows(self):
+ P = self.cls
+ # Under NT, only paths with both a drive and a root are absolute.
+ self.assertFalse(P().is_absolute())
+ self.assertFalse(P('a').is_absolute())
+ self.assertFalse(P('a/b/').is_absolute())
+ self.assertFalse(P('/').is_absolute())
+ self.assertFalse(P('/a').is_absolute())
+ self.assertFalse(P('/a/b/').is_absolute())
+ self.assertFalse(P('c:').is_absolute())
+ self.assertFalse(P('c:a').is_absolute())
+ self.assertFalse(P('c:a/b/').is_absolute())
+ self.assertTrue(P('c:/').is_absolute())
+ self.assertTrue(P('c:/a').is_absolute())
+ self.assertTrue(P('c:/a/b/').is_absolute())
+ # UNC paths are absolute by definition.
+ self.assertTrue(P('//').is_absolute())
+ self.assertTrue(P('//a').is_absolute())
+ self.assertTrue(P('//a/b').is_absolute())
+ self.assertTrue(P('//a/b/').is_absolute())
+ self.assertTrue(P('//a/b/c').is_absolute())
+ self.assertTrue(P('//a/b/c/d').is_absolute())
+ self.assertTrue(P('//?/UNC/').is_absolute())
+ self.assertTrue(P('//?/UNC/spam').is_absolute())
+
+ def test_relative_to_common(self):
+ P = self.cls
+ p = P('a/b')
+ self.assertRaises(TypeError, p.relative_to)
+ self.assertRaises(TypeError, p.relative_to, b'a')
+ self.assertEqual(p.relative_to(P('')), P('a/b'))
+ self.assertEqual(p.relative_to(''), P('a/b'))
+ self.assertEqual(p.relative_to(P('a')), P('b'))
+ self.assertEqual(p.relative_to('a'), P('b'))
+ self.assertEqual(p.relative_to('a/'), P('b'))
+ self.assertEqual(p.relative_to(P('a/b')), P(''))
+ self.assertEqual(p.relative_to('a/b'), P(''))
+ self.assertEqual(p.relative_to(P(''), walk_up=True), P('a/b'))
+ self.assertEqual(p.relative_to('', walk_up=True), P('a/b'))
+ self.assertEqual(p.relative_to(P('a'), walk_up=True), P('b'))
+ self.assertEqual(p.relative_to('a', walk_up=True), P('b'))
+ self.assertEqual(p.relative_to('a/', walk_up=True), P('b'))
+ self.assertEqual(p.relative_to(P('a/b'), walk_up=True), P(''))
+ self.assertEqual(p.relative_to('a/b', walk_up=True), P(''))
+ self.assertEqual(p.relative_to(P('a/c'), walk_up=True), P('../b'))
+ self.assertEqual(p.relative_to('a/c', walk_up=True), P('../b'))
+ self.assertEqual(p.relative_to(P('a/b/c'), walk_up=True), P('..'))
+ self.assertEqual(p.relative_to('a/b/c', walk_up=True), P('..'))
+ self.assertEqual(p.relative_to(P('c'), walk_up=True), P('../a/b'))
+ self.assertEqual(p.relative_to('c', walk_up=True), P('../a/b'))
+ # Unrelated paths.
+ self.assertRaises(ValueError, p.relative_to, P('c'))
+ self.assertRaises(ValueError, p.relative_to, P('a/b/c'))
+ self.assertRaises(ValueError, p.relative_to, P('a/c'))
+ self.assertRaises(ValueError, p.relative_to, P('/a'))
+ self.assertRaises(ValueError, p.relative_to, P("../a"))
+ self.assertRaises(ValueError, p.relative_to, P("a/.."))
+ self.assertRaises(ValueError, p.relative_to, P("/a/.."))
+ self.assertRaises(ValueError, p.relative_to, P('/'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('/a'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P("../a"), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P("a/.."), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P("/a/.."), walk_up=True)
+ p = P('/a/b')
+ self.assertEqual(p.relative_to(P('/')), P('a/b'))
+ self.assertEqual(p.relative_to('/'), P('a/b'))
+ self.assertEqual(p.relative_to(P('/a')), P('b'))
+ self.assertEqual(p.relative_to('/a'), P('b'))
+ self.assertEqual(p.relative_to('/a/'), P('b'))
+ self.assertEqual(p.relative_to(P('/a/b')), P(''))
+ self.assertEqual(p.relative_to('/a/b'), P(''))
+ self.assertEqual(p.relative_to(P('/'), walk_up=True), P('a/b'))
+ self.assertEqual(p.relative_to('/', walk_up=True), P('a/b'))
+ self.assertEqual(p.relative_to(P('/a'), walk_up=True), P('b'))
+ self.assertEqual(p.relative_to('/a', walk_up=True), P('b'))
+ self.assertEqual(p.relative_to('/a/', walk_up=True), P('b'))
+ self.assertEqual(p.relative_to(P('/a/b'), walk_up=True), P(''))
+ self.assertEqual(p.relative_to('/a/b', walk_up=True), P(''))
+ self.assertEqual(p.relative_to(P('/a/c'), walk_up=True), P('../b'))
+ self.assertEqual(p.relative_to('/a/c', walk_up=True), P('../b'))
+ self.assertEqual(p.relative_to(P('/a/b/c'), walk_up=True), P('..'))
+ self.assertEqual(p.relative_to('/a/b/c', walk_up=True), P('..'))
+ self.assertEqual(p.relative_to(P('/c'), walk_up=True), P('../a/b'))
+ self.assertEqual(p.relative_to('/c', walk_up=True), P('../a/b'))
+ # Unrelated paths.
+ self.assertRaises(ValueError, p.relative_to, P('/c'))
+ self.assertRaises(ValueError, p.relative_to, P('/a/b/c'))
+ self.assertRaises(ValueError, p.relative_to, P('/a/c'))
+ self.assertRaises(ValueError, p.relative_to, P(''))
+ self.assertRaises(ValueError, p.relative_to, '')
+ self.assertRaises(ValueError, p.relative_to, P('a'))
+ self.assertRaises(ValueError, p.relative_to, P("../a"))
+ self.assertRaises(ValueError, p.relative_to, P("a/.."))
+ self.assertRaises(ValueError, p.relative_to, P("/a/.."))
+ self.assertRaises(ValueError, p.relative_to, P(''), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('a'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P("../a"), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P("a/.."), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P("/a/.."), walk_up=True)
+
+ @needs_windows
+ def test_relative_to_windows(self):
+ P = self.cls
+ p = P('C:Foo/Bar')
+ self.assertEqual(p.relative_to(P('c:')), P('Foo/Bar'))
+ self.assertEqual(p.relative_to('c:'), P('Foo/Bar'))
+ self.assertEqual(p.relative_to(P('c:foO')), P('Bar'))
+ self.assertEqual(p.relative_to('c:foO'), P('Bar'))
+ self.assertEqual(p.relative_to('c:foO/'), P('Bar'))
+ self.assertEqual(p.relative_to(P('c:foO/baR')), P())
+ self.assertEqual(p.relative_to('c:foO/baR'), P())
+ self.assertEqual(p.relative_to(P('c:'), walk_up=True), P('Foo/Bar'))
+ self.assertEqual(p.relative_to('c:', walk_up=True), P('Foo/Bar'))
+ self.assertEqual(p.relative_to(P('c:foO'), walk_up=True), P('Bar'))
+ self.assertEqual(p.relative_to('c:foO', walk_up=True), P('Bar'))
+ self.assertEqual(p.relative_to('c:foO/', walk_up=True), P('Bar'))
+ self.assertEqual(p.relative_to(P('c:foO/baR'), walk_up=True), P())
+ self.assertEqual(p.relative_to('c:foO/baR', walk_up=True), P())
+ self.assertEqual(p.relative_to(P('C:Foo/Bar/Baz'), walk_up=True), P('..'))
+ self.assertEqual(p.relative_to(P('C:Foo/Baz'), walk_up=True), P('../Bar'))
+ self.assertEqual(p.relative_to(P('C:Baz/Bar'), walk_up=True), P('../../Foo/Bar'))
+ # Unrelated paths.
+ self.assertRaises(ValueError, p.relative_to, P())
+ self.assertRaises(ValueError, p.relative_to, '')
+ self.assertRaises(ValueError, p.relative_to, P('d:'))
+ self.assertRaises(ValueError, p.relative_to, P('/'))
+ self.assertRaises(ValueError, p.relative_to, P('Foo'))
+ self.assertRaises(ValueError, p.relative_to, P('/Foo'))
+ self.assertRaises(ValueError, p.relative_to, P('C:/Foo'))
+ self.assertRaises(ValueError, p.relative_to, P('C:Foo/Bar/Baz'))
+ self.assertRaises(ValueError, p.relative_to, P('C:Foo/Baz'))
+ self.assertRaises(ValueError, p.relative_to, P(), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, '', walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('d:'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('/'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('Foo'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('/Foo'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('C:/Foo'), walk_up=True)
+ p = P('C:/Foo/Bar')
+ self.assertEqual(p.relative_to(P('c:/')), P('Foo/Bar'))
+ self.assertEqual(p.relative_to('c:/'), P('Foo/Bar'))
+ self.assertEqual(p.relative_to(P('c:/foO')), P('Bar'))
+ self.assertEqual(p.relative_to('c:/foO'), P('Bar'))
+ self.assertEqual(p.relative_to('c:/foO/'), P('Bar'))
+ self.assertEqual(p.relative_to(P('c:/foO/baR')), P())
+ self.assertEqual(p.relative_to('c:/foO/baR'), P())
+ self.assertEqual(p.relative_to(P('c:/'), walk_up=True), P('Foo/Bar'))
+ self.assertEqual(p.relative_to('c:/', walk_up=True), P('Foo/Bar'))
+ self.assertEqual(p.relative_to(P('c:/foO'), walk_up=True), P('Bar'))
+ self.assertEqual(p.relative_to('c:/foO', walk_up=True), P('Bar'))
+ self.assertEqual(p.relative_to('c:/foO/', walk_up=True), P('Bar'))
+ self.assertEqual(p.relative_to(P('c:/foO/baR'), walk_up=True), P())
+ self.assertEqual(p.relative_to('c:/foO/baR', walk_up=True), P())
+ self.assertEqual(p.relative_to('C:/Baz', walk_up=True), P('../Foo/Bar'))
+ self.assertEqual(p.relative_to('C:/Foo/Bar/Baz', walk_up=True), P('..'))
+ self.assertEqual(p.relative_to('C:/Foo/Baz', walk_up=True), P('../Bar'))
+ # Unrelated paths.
+ self.assertRaises(ValueError, p.relative_to, 'c:')
+ self.assertRaises(ValueError, p.relative_to, P('c:'))
+ self.assertRaises(ValueError, p.relative_to, P('C:/Baz'))
+ self.assertRaises(ValueError, p.relative_to, P('C:/Foo/Bar/Baz'))
+ self.assertRaises(ValueError, p.relative_to, P('C:/Foo/Baz'))
+ self.assertRaises(ValueError, p.relative_to, P('C:Foo'))
+ self.assertRaises(ValueError, p.relative_to, P('d:'))
+ self.assertRaises(ValueError, p.relative_to, P('d:/'))
+ self.assertRaises(ValueError, p.relative_to, P('/'))
+ self.assertRaises(ValueError, p.relative_to, P('/Foo'))
+ self.assertRaises(ValueError, p.relative_to, P('//C/Foo'))
+ self.assertRaises(ValueError, p.relative_to, 'c:', walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('c:'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('C:Foo'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('d:'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('d:/'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('/'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('/Foo'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('//C/Foo'), walk_up=True)
+ # UNC paths.
+ p = P('//Server/Share/Foo/Bar')
+ self.assertEqual(p.relative_to(P('//sErver/sHare')), P('Foo/Bar'))
+ self.assertEqual(p.relative_to('//sErver/sHare'), P('Foo/Bar'))
+ self.assertEqual(p.relative_to('//sErver/sHare/'), P('Foo/Bar'))
+ self.assertEqual(p.relative_to(P('//sErver/sHare/Foo')), P('Bar'))
+ self.assertEqual(p.relative_to('//sErver/sHare/Foo'), P('Bar'))
+ self.assertEqual(p.relative_to('//sErver/sHare/Foo/'), P('Bar'))
+ self.assertEqual(p.relative_to(P('//sErver/sHare/Foo/Bar')), P())
+ self.assertEqual(p.relative_to('//sErver/sHare/Foo/Bar'), P())
+ self.assertEqual(p.relative_to(P('//sErver/sHare'), walk_up=True), P('Foo/Bar'))
+ self.assertEqual(p.relative_to('//sErver/sHare', walk_up=True), P('Foo/Bar'))
+ self.assertEqual(p.relative_to('//sErver/sHare/', walk_up=True), P('Foo/Bar'))
+ self.assertEqual(p.relative_to(P('//sErver/sHare/Foo'), walk_up=True), P('Bar'))
+ self.assertEqual(p.relative_to('//sErver/sHare/Foo', walk_up=True), P('Bar'))
+ self.assertEqual(p.relative_to('//sErver/sHare/Foo/', walk_up=True), P('Bar'))
+ self.assertEqual(p.relative_to(P('//sErver/sHare/Foo/Bar'), walk_up=True), P())
+ self.assertEqual(p.relative_to('//sErver/sHare/Foo/Bar', walk_up=True), P())
+ self.assertEqual(p.relative_to(P('//sErver/sHare/bar'), walk_up=True), P('../Foo/Bar'))
+ self.assertEqual(p.relative_to('//sErver/sHare/bar', walk_up=True), P('../Foo/Bar'))
+ # Unrelated paths.
+ self.assertRaises(ValueError, p.relative_to, P('/Server/Share/Foo'))
+ self.assertRaises(ValueError, p.relative_to, P('c:/Server/Share/Foo'))
+ self.assertRaises(ValueError, p.relative_to, P('//z/Share/Foo'))
+ self.assertRaises(ValueError, p.relative_to, P('//Server/z/Foo'))
+ self.assertRaises(ValueError, p.relative_to, P('/Server/Share/Foo'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('c:/Server/Share/Foo'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('//z/Share/Foo'), walk_up=True)
+ self.assertRaises(ValueError, p.relative_to, P('//Server/z/Foo'), walk_up=True)
+
+ def test_is_relative_to_common(self):
+ P = self.cls
+ p = P('a/b')
+ self.assertRaises(TypeError, p.is_relative_to)
+ self.assertRaises(TypeError, p.is_relative_to, b'a')
+ self.assertTrue(p.is_relative_to(P('')))
+ self.assertTrue(p.is_relative_to(''))
+ self.assertTrue(p.is_relative_to(P('a')))
+ self.assertTrue(p.is_relative_to('a/'))
+ self.assertTrue(p.is_relative_to(P('a/b')))
+ self.assertTrue(p.is_relative_to('a/b'))
+ # Unrelated paths.
+ self.assertFalse(p.is_relative_to(P('c')))
+ self.assertFalse(p.is_relative_to(P('a/b/c')))
+ self.assertFalse(p.is_relative_to(P('a/c')))
+ self.assertFalse(p.is_relative_to(P('/a')))
+ p = P('/a/b')
+ self.assertTrue(p.is_relative_to(P('/')))
+ self.assertTrue(p.is_relative_to('/'))
+ self.assertTrue(p.is_relative_to(P('/a')))
+ self.assertTrue(p.is_relative_to('/a'))
+ self.assertTrue(p.is_relative_to('/a/'))
+ self.assertTrue(p.is_relative_to(P('/a/b')))
+ self.assertTrue(p.is_relative_to('/a/b'))
+ # Unrelated paths.
+ self.assertFalse(p.is_relative_to(P('/c')))
+ self.assertFalse(p.is_relative_to(P('/a/b/c')))
+ self.assertFalse(p.is_relative_to(P('/a/c')))
+ self.assertFalse(p.is_relative_to(P('')))
+ self.assertFalse(p.is_relative_to(''))
+ self.assertFalse(p.is_relative_to(P('a')))
+
+ @needs_windows
+ def test_is_relative_to_windows(self):
+ P = self.cls
+ p = P('C:Foo/Bar')
+ self.assertTrue(p.is_relative_to(P('c:')))
+ self.assertTrue(p.is_relative_to('c:'))
+ self.assertTrue(p.is_relative_to(P('c:foO')))
+ self.assertTrue(p.is_relative_to('c:foO'))
+ self.assertTrue(p.is_relative_to('c:foO/'))
+ self.assertTrue(p.is_relative_to(P('c:foO/baR')))
+ self.assertTrue(p.is_relative_to('c:foO/baR'))
+ # Unrelated paths.
+ self.assertFalse(p.is_relative_to(P()))
+ self.assertFalse(p.is_relative_to(''))
+ self.assertFalse(p.is_relative_to(P('d:')))
+ self.assertFalse(p.is_relative_to(P('/')))
+ self.assertFalse(p.is_relative_to(P('Foo')))
+ self.assertFalse(p.is_relative_to(P('/Foo')))
+ self.assertFalse(p.is_relative_to(P('C:/Foo')))
+ self.assertFalse(p.is_relative_to(P('C:Foo/Bar/Baz')))
+ self.assertFalse(p.is_relative_to(P('C:Foo/Baz')))
+ p = P('C:/Foo/Bar')
+ self.assertTrue(p.is_relative_to(P('c:/')))
+ self.assertTrue(p.is_relative_to(P('c:/foO')))
+ self.assertTrue(p.is_relative_to('c:/foO/'))
+ self.assertTrue(p.is_relative_to(P('c:/foO/baR')))
+ self.assertTrue(p.is_relative_to('c:/foO/baR'))
+ # Unrelated paths.
+ self.assertFalse(p.is_relative_to('c:'))
+ self.assertFalse(p.is_relative_to(P('C:/Baz')))
+ self.assertFalse(p.is_relative_to(P('C:/Foo/Bar/Baz')))
+ self.assertFalse(p.is_relative_to(P('C:/Foo/Baz')))
+ self.assertFalse(p.is_relative_to(P('C:Foo')))
+ self.assertFalse(p.is_relative_to(P('d:')))
+ self.assertFalse(p.is_relative_to(P('d:/')))
+ self.assertFalse(p.is_relative_to(P('/')))
+ self.assertFalse(p.is_relative_to(P('/Foo')))
+ self.assertFalse(p.is_relative_to(P('//C/Foo')))
+ # UNC paths.
+ p = P('//Server/Share/Foo/Bar')
+ self.assertTrue(p.is_relative_to(P('//sErver/sHare')))
+ self.assertTrue(p.is_relative_to('//sErver/sHare'))
+ self.assertTrue(p.is_relative_to('//sErver/sHare/'))
+ self.assertTrue(p.is_relative_to(P('//sErver/sHare/Foo')))
+ self.assertTrue(p.is_relative_to('//sErver/sHare/Foo'))
+ self.assertTrue(p.is_relative_to('//sErver/sHare/Foo/'))
+ self.assertTrue(p.is_relative_to(P('//sErver/sHare/Foo/Bar')))
+ self.assertTrue(p.is_relative_to('//sErver/sHare/Foo/Bar'))
+ # Unrelated paths.
+ self.assertFalse(p.is_relative_to(P('/Server/Share/Foo')))
+ self.assertFalse(p.is_relative_to(P('c:/Server/Share/Foo')))
+ self.assertFalse(p.is_relative_to(P('//z/Share/Foo')))
+ self.assertFalse(p.is_relative_to(P('//Server/z/Foo')))
+
class PurePosixPathTest(PurePathTest):
cls = pathlib.PurePosixPath
diff --git a/Lib/test/test_pathlib/test_pathlib_abc.py b/Lib/test/test_pathlib/test_pathlib_abc.py
index 81d9d34..d588442 100644
--- a/Lib/test/test_pathlib/test_pathlib_abc.py
+++ b/Lib/test/test_pathlib/test_pathlib_abc.py
@@ -71,7 +71,7 @@ class DummyPurePath(PurePathBase):
return hash(str(self))
def __repr__(self):
- return "{}({!r})".format(self.__class__.__name__, self.as_posix())
+ return "{}({!r})".format(self.__class__.__name__, str(self))
def with_segments(self, *pathsegments):
return type(self)(*pathsegments)
@@ -107,12 +107,6 @@ class DummyPurePathTest(unittest.TestCase):
P('a/b/c')
P('/a/b/c')
- def test_fspath_common(self):
- self.assertRaises(TypeError, os.fspath, self.cls(''))
-
- def test_as_bytes_common(self):
- self.assertRaises(TypeError, bytes, self.cls(''))
-
def _check_str_subclass(self, *args):
# Issue #21127: it should be possible to construct a PurePath object
# from a str subclass instance, and it then gets converted to
@@ -161,7 +155,6 @@ class DummyPurePathTest(unittest.TestCase):
self.assertEqual(42, p.with_stem('foo').session_id)
self.assertEqual(42, p.with_suffix('.foo').session_id)
self.assertEqual(42, p.with_segments('foo').session_id)
- self.assertEqual(42, p.relative_to('foo').session_id)
self.assertEqual(42, p.parent.session_id)
for parent in p.parents:
self.assertEqual(42, parent.session_id)
@@ -303,12 +296,6 @@ class DummyPurePathTest(unittest.TestCase):
p = self.cls('//a/b/c/d')
self.assertEqual(str(p), '\\\\a\\b\\c\\d')
- def test_as_posix_common(self):
- P = self.cls
- for pathstr in ('a', 'a/b', 'a/b/c', '/', '/a/b', '/a/b/c'):
- self.assertEqual(P(pathstr).as_posix(), pathstr)
- # Other tests for as_posix() are in test_equivalences().
-
def test_match_empty(self):
P = self.cls
self.assertRaises(ValueError, P('a').match, '')
@@ -615,50 +602,6 @@ class DummyPurePathTest(unittest.TestCase):
with self.assertRaises(IndexError):
par[2]
- def test_drive_common(self):
- P = self.cls
- self.assertEqual(P('a/b').drive, '')
- self.assertEqual(P('/a/b').drive, '')
- self.assertEqual(P('').drive, '')
-
- @needs_windows
- def test_drive_windows(self):
- P = self.cls
- self.assertEqual(P('c:').drive, 'c:')
- self.assertEqual(P('c:a/b').drive, 'c:')
- self.assertEqual(P('c:/').drive, 'c:')
- self.assertEqual(P('c:/a/b/').drive, 'c:')
- self.assertEqual(P('//a/b').drive, '\\\\a\\b')
- self.assertEqual(P('//a/b/').drive, '\\\\a\\b')
- self.assertEqual(P('//a/b/c/d').drive, '\\\\a\\b')
- self.assertEqual(P('./c:a').drive, '')
-
- def test_root_common(self):
- P = self.cls
- sep = self.sep
- self.assertEqual(P('').root, '')
- self.assertEqual(P('a/b').root, '')
- self.assertEqual(P('/').root, sep)
- self.assertEqual(P('/a/b').root, sep)
-
- @needs_posix
- def test_root_posix(self):
- P = self.cls
- self.assertEqual(P('/a/b').root, '/')
- # POSIX special case for two leading slashes.
- self.assertEqual(P('//a/b').root, '//')
-
- @needs_windows
- def test_root_windows(self):
- P = self.cls
- self.assertEqual(P('c:').root, '')
- self.assertEqual(P('c:a/b').root, '')
- self.assertEqual(P('c:/').root, '\\')
- self.assertEqual(P('c:/a/b/').root, '\\')
- self.assertEqual(P('//a/b').root, '\\')
- self.assertEqual(P('//a/b/').root, '\\')
- self.assertEqual(P('//a/b/c/d').root, '\\')
-
def test_anchor_common(self):
P = self.cls
sep = self.sep
@@ -967,311 +910,6 @@ class DummyPurePathTest(unittest.TestCase):
self.assertRaises(ValueError, P('a/b').with_suffix, '.d/.')
self.assertRaises(TypeError, P('a/b').with_suffix, None)
- def test_relative_to_common(self):
- P = self.cls
- p = P('a/b')
- self.assertRaises(TypeError, p.relative_to)
- self.assertRaises(TypeError, p.relative_to, b'a')
- self.assertEqual(p.relative_to(P('')), P('a/b'))
- self.assertEqual(p.relative_to(''), P('a/b'))
- self.assertEqual(p.relative_to(P('a')), P('b'))
- self.assertEqual(p.relative_to('a'), P('b'))
- self.assertEqual(p.relative_to('a/'), P('b'))
- self.assertEqual(p.relative_to(P('a/b')), P(''))
- self.assertEqual(p.relative_to('a/b'), P(''))
- self.assertEqual(p.relative_to(P(''), walk_up=True), P('a/b'))
- self.assertEqual(p.relative_to('', walk_up=True), P('a/b'))
- self.assertEqual(p.relative_to(P('a'), walk_up=True), P('b'))
- self.assertEqual(p.relative_to('a', walk_up=True), P('b'))
- self.assertEqual(p.relative_to('a/', walk_up=True), P('b'))
- self.assertEqual(p.relative_to(P('a/b'), walk_up=True), P(''))
- self.assertEqual(p.relative_to('a/b', walk_up=True), P(''))
- self.assertEqual(p.relative_to(P('a/c'), walk_up=True), P('../b'))
- self.assertEqual(p.relative_to('a/c', walk_up=True), P('../b'))
- self.assertEqual(p.relative_to(P('a/b/c'), walk_up=True), P('..'))
- self.assertEqual(p.relative_to('a/b/c', walk_up=True), P('..'))
- self.assertEqual(p.relative_to(P('c'), walk_up=True), P('../a/b'))
- self.assertEqual(p.relative_to('c', walk_up=True), P('../a/b'))
- # Unrelated paths.
- self.assertRaises(ValueError, p.relative_to, P('c'))
- self.assertRaises(ValueError, p.relative_to, P('a/b/c'))
- self.assertRaises(ValueError, p.relative_to, P('a/c'))
- self.assertRaises(ValueError, p.relative_to, P('/a'))
- self.assertRaises(ValueError, p.relative_to, P("../a"))
- self.assertRaises(ValueError, p.relative_to, P("a/.."))
- self.assertRaises(ValueError, p.relative_to, P("/a/.."))
- self.assertRaises(ValueError, p.relative_to, P('/'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('/a'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P("../a"), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P("a/.."), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P("/a/.."), walk_up=True)
- p = P('/a/b')
- self.assertEqual(p.relative_to(P('/')), P('a/b'))
- self.assertEqual(p.relative_to('/'), P('a/b'))
- self.assertEqual(p.relative_to(P('/a')), P('b'))
- self.assertEqual(p.relative_to('/a'), P('b'))
- self.assertEqual(p.relative_to('/a/'), P('b'))
- self.assertEqual(p.relative_to(P('/a/b')), P(''))
- self.assertEqual(p.relative_to('/a/b'), P(''))
- self.assertEqual(p.relative_to(P('/'), walk_up=True), P('a/b'))
- self.assertEqual(p.relative_to('/', walk_up=True), P('a/b'))
- self.assertEqual(p.relative_to(P('/a'), walk_up=True), P('b'))
- self.assertEqual(p.relative_to('/a', walk_up=True), P('b'))
- self.assertEqual(p.relative_to('/a/', walk_up=True), P('b'))
- self.assertEqual(p.relative_to(P('/a/b'), walk_up=True), P(''))
- self.assertEqual(p.relative_to('/a/b', walk_up=True), P(''))
- self.assertEqual(p.relative_to(P('/a/c'), walk_up=True), P('../b'))
- self.assertEqual(p.relative_to('/a/c', walk_up=True), P('../b'))
- self.assertEqual(p.relative_to(P('/a/b/c'), walk_up=True), P('..'))
- self.assertEqual(p.relative_to('/a/b/c', walk_up=True), P('..'))
- self.assertEqual(p.relative_to(P('/c'), walk_up=True), P('../a/b'))
- self.assertEqual(p.relative_to('/c', walk_up=True), P('../a/b'))
- # Unrelated paths.
- self.assertRaises(ValueError, p.relative_to, P('/c'))
- self.assertRaises(ValueError, p.relative_to, P('/a/b/c'))
- self.assertRaises(ValueError, p.relative_to, P('/a/c'))
- self.assertRaises(ValueError, p.relative_to, P(''))
- self.assertRaises(ValueError, p.relative_to, '')
- self.assertRaises(ValueError, p.relative_to, P('a'))
- self.assertRaises(ValueError, p.relative_to, P("../a"))
- self.assertRaises(ValueError, p.relative_to, P("a/.."))
- self.assertRaises(ValueError, p.relative_to, P("/a/.."))
- self.assertRaises(ValueError, p.relative_to, P(''), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('a'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P("../a"), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P("a/.."), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P("/a/.."), walk_up=True)
-
- @needs_windows
- def test_relative_to_windows(self):
- P = self.cls
- p = P('C:Foo/Bar')
- self.assertEqual(p.relative_to(P('c:')), P('Foo/Bar'))
- self.assertEqual(p.relative_to('c:'), P('Foo/Bar'))
- self.assertEqual(p.relative_to(P('c:foO')), P('Bar'))
- self.assertEqual(p.relative_to('c:foO'), P('Bar'))
- self.assertEqual(p.relative_to('c:foO/'), P('Bar'))
- self.assertEqual(p.relative_to(P('c:foO/baR')), P())
- self.assertEqual(p.relative_to('c:foO/baR'), P())
- self.assertEqual(p.relative_to(P('c:'), walk_up=True), P('Foo/Bar'))
- self.assertEqual(p.relative_to('c:', walk_up=True), P('Foo/Bar'))
- self.assertEqual(p.relative_to(P('c:foO'), walk_up=True), P('Bar'))
- self.assertEqual(p.relative_to('c:foO', walk_up=True), P('Bar'))
- self.assertEqual(p.relative_to('c:foO/', walk_up=True), P('Bar'))
- self.assertEqual(p.relative_to(P('c:foO/baR'), walk_up=True), P())
- self.assertEqual(p.relative_to('c:foO/baR', walk_up=True), P())
- self.assertEqual(p.relative_to(P('C:Foo/Bar/Baz'), walk_up=True), P('..'))
- self.assertEqual(p.relative_to(P('C:Foo/Baz'), walk_up=True), P('../Bar'))
- self.assertEqual(p.relative_to(P('C:Baz/Bar'), walk_up=True), P('../../Foo/Bar'))
- # Unrelated paths.
- self.assertRaises(ValueError, p.relative_to, P())
- self.assertRaises(ValueError, p.relative_to, '')
- self.assertRaises(ValueError, p.relative_to, P('d:'))
- self.assertRaises(ValueError, p.relative_to, P('/'))
- self.assertRaises(ValueError, p.relative_to, P('Foo'))
- self.assertRaises(ValueError, p.relative_to, P('/Foo'))
- self.assertRaises(ValueError, p.relative_to, P('C:/Foo'))
- self.assertRaises(ValueError, p.relative_to, P('C:Foo/Bar/Baz'))
- self.assertRaises(ValueError, p.relative_to, P('C:Foo/Baz'))
- self.assertRaises(ValueError, p.relative_to, P(), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, '', walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('d:'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('/'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('Foo'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('/Foo'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('C:/Foo'), walk_up=True)
- p = P('C:/Foo/Bar')
- self.assertEqual(p.relative_to(P('c:/')), P('Foo/Bar'))
- self.assertEqual(p.relative_to('c:/'), P('Foo/Bar'))
- self.assertEqual(p.relative_to(P('c:/foO')), P('Bar'))
- self.assertEqual(p.relative_to('c:/foO'), P('Bar'))
- self.assertEqual(p.relative_to('c:/foO/'), P('Bar'))
- self.assertEqual(p.relative_to(P('c:/foO/baR')), P())
- self.assertEqual(p.relative_to('c:/foO/baR'), P())
- self.assertEqual(p.relative_to(P('c:/'), walk_up=True), P('Foo/Bar'))
- self.assertEqual(p.relative_to('c:/', walk_up=True), P('Foo/Bar'))
- self.assertEqual(p.relative_to(P('c:/foO'), walk_up=True), P('Bar'))
- self.assertEqual(p.relative_to('c:/foO', walk_up=True), P('Bar'))
- self.assertEqual(p.relative_to('c:/foO/', walk_up=True), P('Bar'))
- self.assertEqual(p.relative_to(P('c:/foO/baR'), walk_up=True), P())
- self.assertEqual(p.relative_to('c:/foO/baR', walk_up=True), P())
- self.assertEqual(p.relative_to('C:/Baz', walk_up=True), P('../Foo/Bar'))
- self.assertEqual(p.relative_to('C:/Foo/Bar/Baz', walk_up=True), P('..'))
- self.assertEqual(p.relative_to('C:/Foo/Baz', walk_up=True), P('../Bar'))
- # Unrelated paths.
- self.assertRaises(ValueError, p.relative_to, 'c:')
- self.assertRaises(ValueError, p.relative_to, P('c:'))
- self.assertRaises(ValueError, p.relative_to, P('C:/Baz'))
- self.assertRaises(ValueError, p.relative_to, P('C:/Foo/Bar/Baz'))
- self.assertRaises(ValueError, p.relative_to, P('C:/Foo/Baz'))
- self.assertRaises(ValueError, p.relative_to, P('C:Foo'))
- self.assertRaises(ValueError, p.relative_to, P('d:'))
- self.assertRaises(ValueError, p.relative_to, P('d:/'))
- self.assertRaises(ValueError, p.relative_to, P('/'))
- self.assertRaises(ValueError, p.relative_to, P('/Foo'))
- self.assertRaises(ValueError, p.relative_to, P('//C/Foo'))
- self.assertRaises(ValueError, p.relative_to, 'c:', walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('c:'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('C:Foo'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('d:'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('d:/'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('/'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('/Foo'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('//C/Foo'), walk_up=True)
- # UNC paths.
- p = P('//Server/Share/Foo/Bar')
- self.assertEqual(p.relative_to(P('//sErver/sHare')), P('Foo/Bar'))
- self.assertEqual(p.relative_to('//sErver/sHare'), P('Foo/Bar'))
- self.assertEqual(p.relative_to('//sErver/sHare/'), P('Foo/Bar'))
- self.assertEqual(p.relative_to(P('//sErver/sHare/Foo')), P('Bar'))
- self.assertEqual(p.relative_to('//sErver/sHare/Foo'), P('Bar'))
- self.assertEqual(p.relative_to('//sErver/sHare/Foo/'), P('Bar'))
- self.assertEqual(p.relative_to(P('//sErver/sHare/Foo/Bar')), P())
- self.assertEqual(p.relative_to('//sErver/sHare/Foo/Bar'), P())
- self.assertEqual(p.relative_to(P('//sErver/sHare'), walk_up=True), P('Foo/Bar'))
- self.assertEqual(p.relative_to('//sErver/sHare', walk_up=True), P('Foo/Bar'))
- self.assertEqual(p.relative_to('//sErver/sHare/', walk_up=True), P('Foo/Bar'))
- self.assertEqual(p.relative_to(P('//sErver/sHare/Foo'), walk_up=True), P('Bar'))
- self.assertEqual(p.relative_to('//sErver/sHare/Foo', walk_up=True), P('Bar'))
- self.assertEqual(p.relative_to('//sErver/sHare/Foo/', walk_up=True), P('Bar'))
- self.assertEqual(p.relative_to(P('//sErver/sHare/Foo/Bar'), walk_up=True), P())
- self.assertEqual(p.relative_to('//sErver/sHare/Foo/Bar', walk_up=True), P())
- self.assertEqual(p.relative_to(P('//sErver/sHare/bar'), walk_up=True), P('../Foo/Bar'))
- self.assertEqual(p.relative_to('//sErver/sHare/bar', walk_up=True), P('../Foo/Bar'))
- # Unrelated paths.
- self.assertRaises(ValueError, p.relative_to, P('/Server/Share/Foo'))
- self.assertRaises(ValueError, p.relative_to, P('c:/Server/Share/Foo'))
- self.assertRaises(ValueError, p.relative_to, P('//z/Share/Foo'))
- self.assertRaises(ValueError, p.relative_to, P('//Server/z/Foo'))
- self.assertRaises(ValueError, p.relative_to, P('/Server/Share/Foo'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('c:/Server/Share/Foo'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('//z/Share/Foo'), walk_up=True)
- self.assertRaises(ValueError, p.relative_to, P('//Server/z/Foo'), walk_up=True)
-
- def test_is_relative_to_common(self):
- P = self.cls
- p = P('a/b')
- self.assertRaises(TypeError, p.is_relative_to)
- self.assertRaises(TypeError, p.is_relative_to, b'a')
- self.assertTrue(p.is_relative_to(P('')))
- self.assertTrue(p.is_relative_to(''))
- self.assertTrue(p.is_relative_to(P('a')))
- self.assertTrue(p.is_relative_to('a/'))
- self.assertTrue(p.is_relative_to(P('a/b')))
- self.assertTrue(p.is_relative_to('a/b'))
- # Unrelated paths.
- self.assertFalse(p.is_relative_to(P('c')))
- self.assertFalse(p.is_relative_to(P('a/b/c')))
- self.assertFalse(p.is_relative_to(P('a/c')))
- self.assertFalse(p.is_relative_to(P('/a')))
- p = P('/a/b')
- self.assertTrue(p.is_relative_to(P('/')))
- self.assertTrue(p.is_relative_to('/'))
- self.assertTrue(p.is_relative_to(P('/a')))
- self.assertTrue(p.is_relative_to('/a'))
- self.assertTrue(p.is_relative_to('/a/'))
- self.assertTrue(p.is_relative_to(P('/a/b')))
- self.assertTrue(p.is_relative_to('/a/b'))
- # Unrelated paths.
- self.assertFalse(p.is_relative_to(P('/c')))
- self.assertFalse(p.is_relative_to(P('/a/b/c')))
- self.assertFalse(p.is_relative_to(P('/a/c')))
- self.assertFalse(p.is_relative_to(P('')))
- self.assertFalse(p.is_relative_to(''))
- self.assertFalse(p.is_relative_to(P('a')))
-
- @needs_windows
- def test_is_relative_to_windows(self):
- P = self.cls
- p = P('C:Foo/Bar')
- self.assertTrue(p.is_relative_to(P('c:')))
- self.assertTrue(p.is_relative_to('c:'))
- self.assertTrue(p.is_relative_to(P('c:foO')))
- self.assertTrue(p.is_relative_to('c:foO'))
- self.assertTrue(p.is_relative_to('c:foO/'))
- self.assertTrue(p.is_relative_to(P('c:foO/baR')))
- self.assertTrue(p.is_relative_to('c:foO/baR'))
- # Unrelated paths.
- self.assertFalse(p.is_relative_to(P()))
- self.assertFalse(p.is_relative_to(''))
- self.assertFalse(p.is_relative_to(P('d:')))
- self.assertFalse(p.is_relative_to(P('/')))
- self.assertFalse(p.is_relative_to(P('Foo')))
- self.assertFalse(p.is_relative_to(P('/Foo')))
- self.assertFalse(p.is_relative_to(P('C:/Foo')))
- self.assertFalse(p.is_relative_to(P('C:Foo/Bar/Baz')))
- self.assertFalse(p.is_relative_to(P('C:Foo/Baz')))
- p = P('C:/Foo/Bar')
- self.assertTrue(p.is_relative_to(P('c:/')))
- self.assertTrue(p.is_relative_to(P('c:/foO')))
- self.assertTrue(p.is_relative_to('c:/foO/'))
- self.assertTrue(p.is_relative_to(P('c:/foO/baR')))
- self.assertTrue(p.is_relative_to('c:/foO/baR'))
- # Unrelated paths.
- self.assertFalse(p.is_relative_to('c:'))
- self.assertFalse(p.is_relative_to(P('C:/Baz')))
- self.assertFalse(p.is_relative_to(P('C:/Foo/Bar/Baz')))
- self.assertFalse(p.is_relative_to(P('C:/Foo/Baz')))
- self.assertFalse(p.is_relative_to(P('C:Foo')))
- self.assertFalse(p.is_relative_to(P('d:')))
- self.assertFalse(p.is_relative_to(P('d:/')))
- self.assertFalse(p.is_relative_to(P('/')))
- self.assertFalse(p.is_relative_to(P('/Foo')))
- self.assertFalse(p.is_relative_to(P('//C/Foo')))
- # UNC paths.
- p = P('//Server/Share/Foo/Bar')
- self.assertTrue(p.is_relative_to(P('//sErver/sHare')))
- self.assertTrue(p.is_relative_to('//sErver/sHare'))
- self.assertTrue(p.is_relative_to('//sErver/sHare/'))
- self.assertTrue(p.is_relative_to(P('//sErver/sHare/Foo')))
- self.assertTrue(p.is_relative_to('//sErver/sHare/Foo'))
- self.assertTrue(p.is_relative_to('//sErver/sHare/Foo/'))
- self.assertTrue(p.is_relative_to(P('//sErver/sHare/Foo/Bar')))
- self.assertTrue(p.is_relative_to('//sErver/sHare/Foo/Bar'))
- # Unrelated paths.
- self.assertFalse(p.is_relative_to(P('/Server/Share/Foo')))
- self.assertFalse(p.is_relative_to(P('c:/Server/Share/Foo')))
- self.assertFalse(p.is_relative_to(P('//z/Share/Foo')))
- self.assertFalse(p.is_relative_to(P('//Server/z/Foo')))
-
- @needs_posix
- def test_is_absolute_posix(self):
- P = self.cls
- self.assertFalse(P('').is_absolute())
- self.assertFalse(P('a').is_absolute())
- self.assertFalse(P('a/b/').is_absolute())
- self.assertTrue(P('/').is_absolute())
- self.assertTrue(P('/a').is_absolute())
- self.assertTrue(P('/a/b/').is_absolute())
- self.assertTrue(P('//a').is_absolute())
- self.assertTrue(P('//a/b').is_absolute())
-
- @needs_windows
- def test_is_absolute_windows(self):
- P = self.cls
- # Under NT, only paths with both a drive and a root are absolute.
- self.assertFalse(P().is_absolute())
- self.assertFalse(P('a').is_absolute())
- self.assertFalse(P('a/b/').is_absolute())
- self.assertFalse(P('/').is_absolute())
- self.assertFalse(P('/a').is_absolute())
- self.assertFalse(P('/a/b/').is_absolute())
- self.assertFalse(P('c:').is_absolute())
- self.assertFalse(P('c:a').is_absolute())
- self.assertFalse(P('c:a/b/').is_absolute())
- self.assertTrue(P('c:/').is_absolute())
- self.assertTrue(P('c:/a').is_absolute())
- self.assertTrue(P('c:/a/b/').is_absolute())
- # UNC paths are absolute by definition.
- self.assertTrue(P('//').is_absolute())
- self.assertTrue(P('//a').is_absolute())
- self.assertTrue(P('//a/b').is_absolute())
- self.assertTrue(P('//a/b/').is_absolute())
- self.assertTrue(P('//a/b/c').is_absolute())
- self.assertTrue(P('//a/b/c/d').is_absolute())
- self.assertTrue(P('//?/UNC/').is_absolute())
- self.assertTrue(P('//?/UNC/spam').is_absolute())
-
#
# Tests for the virtual classes.
@@ -1320,7 +958,7 @@ class DummyPath(PathBase):
return hash(str(self))
def __repr__(self):
- return "{}({!r})".format(self.__class__.__name__, self.as_posix())
+ return "{}({!r})".format(self.__class__.__name__, str(self))
def with_segments(self, *pathsegments):
return type(self)(*pathsegments)
@@ -1631,8 +1269,8 @@ class DummyPathTest(DummyPurePathTest):
source_walk = ordered_walk(source)
target_walk = ordered_walk(target)
for source_item, target_item in zip(source_walk, target_walk, strict=True):
- self.assertEqual(source_item[0].relative_to(source),
- target_item[0].relative_to(target)) # dirpath
+ self.assertEqual(source_item[0].parts[len(source.parts):],
+ target_item[0].parts[len(target.parts):]) # dirpath
self.assertEqual(source_item[1], target_item[1]) # dirnames
self.assertEqual(source_item[2], target_item[2]) # filenames
# Compare files and symlinks