Skip to content

gh-99029: Fix handling of PureWindowsPath('C:\<blah>').relative_to('C:') #99031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brettcannon merged 5 commits into from
Nov 25, 2022
+20 −52
Merged

gh-99029: Fix handling of PureWindowsPath('C:\<blah>').relative_to('C:') #99031

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdfcc65
gh-99029: Fix handling of `PureWindowsPath('C:\<blah>').relative_to('…
barneygale Nov 2, 2022
4b190a1
Restore deleted assertions
barneygale Nov 3, 2022
4d13ac8
Stop using `os.path.relpath()`
barneygale Nov 12, 2022
3b37a0d
Simplify algorithm a little
barneygale Nov 12, 2022
a3e5517
Use f-strings for exception messages
barneygale Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Restore deleted assertions
  • Loading branch information
@barneygale
barneygale committed Nov 3, 2022
commit 4b190a1a11c09d108c8cbfc24054040daf33e1b7
2 changes: 2 additions & 0 deletions Lib/test/test_pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,7 @@ def test_relative_to(self):
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'))
Expand All @@ -1211,6 +1212,7 @@ def test_relative_to(self):
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)
Expand Down