Skip to content

GH-78079: Fix UNC device path root normalization in pathlib #102003

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
barneygale merged 10 commits into from
Apr 14, 2023
+43 −3
Merged

GH-78079: Fix UNC device path root normalization in pathlib #102003

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
99f62bc
GH-78079: Fix UNC device path root normalization in pathlib
barneygale Feb 2, 2023
6651b67
A few more test cases
barneygale Feb 20, 2023
87519ba
Merge branch 'main' into gh-78079-win-device-path-roots
barneygale Feb 20, 2023
c444a3c
Update Lib/pathlib.py
barneygale Mar 10, 2023
36623c0
Fix handling of UNC paths with incomplete drives in glob(), walk(), etc.
barneygale Mar 10, 2023
aea236e
Test handling of UNC paths with incomplete drives in joinpath()
barneygale Mar 10, 2023
bb0af91
Merge branch 'main' into gh-78079-win-device-path-roots
barneygale Mar 10, 2023
f412f87
Merge branch 'main' into gh-78079-win-device-path-roots
barneygale Apr 3, 2023
8ff07fc
Merge branch 'main' into gh-78079-win-device-path-roots
barneygale Apr 9, 2023
723a5aa
Merge branch 'main' into gh-78079-win-device-path-roots
barneygale Apr 11, 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 handling of UNC paths with incomplete drives in glob(), walk(), etc.
  • Loading branch information
@barneygale
barneygale committed Mar 10, 2023
commit 36623c0b3439089d7d706eeae565f928c0fb7b88
11 changes: 9 additions & 2 deletions Lib/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,8 +718,15 @@ def __new__(cls, *args, **kwargs):
def _make_child_relpath(self, part):
# This is an optimization used for dir walking. `part` must be
# a single part relative to this path.
parts = self._parts + [part]
return self._from_parsed_parts(self._drv, self._root, parts)
drv = self._drv
root = self._root
parts = self._parts
if drv and not root and not parts:
sep = self._flavour.sep
if drv.startswith(sep) and not drv.endswith(sep):
# Incomplete UNC drive like '//foo'.
return self._from_parts([self, part])
return self._from_parsed_parts(drv, root, parts + [part])

def __enter__(self):
# In previous versions of pathlib, __exit__() marked this path as
Expand Down