Skip to content

GH-80486: Fix handling of NTFS alternate data streams in pathlib #102454

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
zooba merged 12 commits into from
Mar 10, 2023
Merged

GH-80486: Fix handling of NTFS alternate data streams in pathlib #102454

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
15aadf9
Fixed bugs with drive-relative paths and NTFS ADS paths in pathlib
kmaork Mar 15, 2019
c827f98
Merge branch 'master' into fix-issue-36305
kmaork Jan 16, 2020
64fc342
Merge branch 'master' into fix-issue-36305
kmaork Feb 29, 2020
86c0408
Undo pathlib changes
barneygale Feb 22, 2023
c08602b
Merge branch 'main' into gh-80486-ntfs-alt-stream-path
barneygale Mar 6, 2023
cb9ce9d
Remove a couple of incorrect test cases
barneygale Mar 6, 2023
fe5cfb3
Fix `_format_parsed_parts()`
barneygale Mar 6, 2023
bc225f5
Restore deleted test case.
barneygale Mar 6, 2023
9aa4077
Fix expanduser()
barneygale Mar 6, 2023
0be2dc4
Use `_from_parsed_parts()` in `expanduser()`
barneygale Mar 6, 2023
8386140
Improve news blurb.
barneygale Mar 6, 2023
e6f11d4
Remove test case affected by GH-102475.
barneygale Mar 6, 2023
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
Merge branch 'main' into gh-80486-ntfs-alt-stream-path
  • Loading branch information
@barneygale
barneygale committed Mar 6, 2023
commit c08602b993f2b6ca8752054e32a6f7b7aa7479a8
32 changes: 6 additions & 26 deletions Lib/test/test_pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ def test_parse_parts(self):
check(['a', '/b', 'c'], ('', '\\', ['\\', 'b', 'c']))
check(['Z:/a', '/b', 'c'], ('Z:', '\\', ['Z:\\', 'b', 'c']))
check(['//?/Z:/a', '/b', 'c'], ('\\\\?\\Z:', '\\', ['\\\\?\\Z:\\', 'b', 'c']))
# Joining with the same drive => the first path is appended to if
# the second path is relative.
check(['c:/a/b', 'c:x/y'], ('c:', '\\', ['c:\\', 'a', 'b', 'x', 'y']))
check(['c:/a/b', 'c:/x/y'], ('c:', '\\', ['c:\\', 'x', 'y']))
# Second part has a drive but not root.
check(['a', 'Z:b', 'c'], ('Z:', '', ['Z:', 'a', 'b', 'c']))
check(['Y:a', 'Z:b', 'c'], ('Z:', '', ['Z:', 'a', 'b', 'c']))
Expand All @@ -128,30 +132,6 @@ def test_parse_parts(self):
check(['D:a', './c:b'], ('D:', '', ['D:', 'a', 'c:b']))
check(['D:/a', './c:b'], ('D:', '\\', ['D:\\', 'a', 'c:b']))

def test_splitroot(self):
f = self.flavour.splitroot
self.assertEqual(f(''), ('', '', ''))
self.assertEqual(f('a'), ('', '', 'a'))
self.assertEqual(f('a\\b'), ('', '', 'a\\b'))
self.assertEqual(f('\\a'), ('', '\\', 'a'))
self.assertEqual(f('\\a\\b'), ('', '\\', 'a\\b'))
self.assertEqual(f('c:a\\b'), ('c:', '', 'a\\b'))
self.assertEqual(f('c:\\a\\b'), ('c:', '\\', 'a\\b'))
# Redundant slashes in the root are collapsed.
self.assertEqual(f('\\\\a'), ('', '\\', 'a'))
self.assertEqual(f('\\\\\\a/b'), ('', '\\', 'a/b'))
self.assertEqual(f('c:\\\\a'), ('c:', '\\', 'a'))
self.assertEqual(f('c:\\\\\\a/b'), ('c:', '\\', 'a/b'))
# Valid UNC paths.
self.assertEqual(f('\\\\a\\b'), ('\\\\a\\b', '\\', ''))
self.assertEqual(f('\\\\a\\b\\'), ('\\\\a\\b', '\\', ''))
self.assertEqual(f('\\\\a\\b\\c\\d'), ('\\\\a\\b', '\\', 'c\\d'))
# These are non-UNC paths (according to ntpath.py and test_ntpath).
# However, command.com says such paths are invalid, so it's
# difficult to know what the right semantics are.
self.assertEqual(f('\\\\\\a\\b'), ('', '\\', 'a\\b'))
self.assertEqual(f('\\\\a'), ('', '\\', 'a'))


#
# Tests for the pure classes.
Expand Down Expand Up @@ -3134,7 +3114,7 @@ def check():
env.pop('HOMEPATH', None)
env['USERPROFILE'] = 'C:\\Users\\alice'
check()

# bpo-38883: ignore `HOME` when set on windows
env['HOME'] = 'C:\\Users\\eve'
check()
Expand All @@ -3143,7 +3123,7 @@ def test_resolve(self):
P = self.cls
p = P(BASE, './a:b')
self.assertEqual(str(p.resolve(strict=False)), f'{BASE}\\a:b')


class PurePathSubclassTest(_BasePurePathTest, unittest.TestCase):
class cls(pathlib.PurePath):
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.