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
Fix _format_parsed_parts()
  • Loading branch information
@barneygale
barneygale committed Mar 6, 2023
commit fe5cfb3c4bd04f2375742bc9d84933a902e2c732
5 changes: 3 additions & 2 deletions Lib/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,9 @@ def _from_parsed_parts(cls, drv, root, parts):
def _format_parsed_parts(cls, drv, root, parts):
if drv or root:
return drv + root + cls._flavour.sep.join(parts[1:])
else:
return cls._flavour.sep.join(parts)
elif parts and cls._flavour.splitdrive(parts[0])[0]:
Comment thread
barneygale marked this conversation as resolved.
parts = ['.'] + parts
return cls._flavour.sep.join(parts)

def __str__(self):
"""Return the string representation of the path, suitable for
Expand Down