Skip to content

gh-96290: support partial/invalid UNC drives in normpath() and splitdrive() #100351

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 11 commits into from
Jan 12, 2023
Merged

gh-96290: support partial/invalid UNC drives in normpath() and splitdrive() #100351

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1fb70c7
gh-96290: support partial/invalid UNC drives in normpath() and splitd…
barneygale Dec 19, 2022
953f937
Merge branch 'main' into gh-96290-ntpath-normpath-fix
barneygale Dec 24, 2022
d2818a3
Update Lib/ntpath.py
barneygale Dec 28, 2022
5965f0f
Fix tests
barneygale Dec 29, 2022
58d5d9f
Update Lib/test/test_ntpath.py
barneygale Dec 29, 2022
bad4b5d
Update Lib/test/test_ntpath.py
barneygale Dec 29, 2022
5b67a74
Update Lib/test/test_ntpath.py
barneygale Dec 29, 2022
0b58cd4
Tweak handling of terminal slash in UNC drives
barneygale Jan 10, 2023
165761d
Reduce splitdrive() diff
barneygale Jan 10, 2023
1f7d54b
Restore normpath() test with empty share name
barneygale Jan 10, 2023
e2e6606
Add test for normal UNC paths and device paths without trailing backs…
barneygale Jan 12, 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
Update Lib/ntpath.py 
Co-authored-by: Eryk Sun <eryksun@gmail.com>
  • Loading branch information
@barneygale @eryksun
barneygale and eryksun authored Dec 28, 2022
commit d2818a35c134c48d42f9f924f5165df3151a8492
26 changes: 15 additions & 11 deletions Lib/ntpath.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,27 +175,31 @@ def splitdrive(p):
sep = b'\\'
altsep = b'/'
colon = b':'
unc_prefix = b'\\\\?\\UNC\\'
unc_prefix = b'\\\\'
unc_device_prefix = b'\\\\?\\UNC\\'
else:
sep = '\\'
altsep = '/'
colon = ':'
unc_prefix = '\\\\?\\UNC\\'
unc_prefix = '\\\\'
unc_device_prefix = '\\\\?\\UNC\\'
normp = p.replace(altsep, sep)
if normp[1:2] == colon and normp[:1] != sep:
# Drive-letter logical drives, e.g. X:
# Drive-letter drives, e.g. X:
return p[:2], p[2:]
if normp[:2] == sep * 2:
if normp[:2] == unc_prefix:
# UNC drives, e.g. \\server\share or \\?\UNC\server\share
# Device drives, e.g. \\.\device or \\?\device
start = 8 if normp[:8].upper() == unc_prefix else 2
index = normp.find(sep, start)
if index == -1:
start = 8 if normp[:8].upper() == unc_device_prefix else 2
index1 = normp.find(sep, start)
if index1 == -1:
return p, p[:0]
index = normp.find(sep, index + 1)
if index == -1:
return p, p[:0]
return p[:index], p[index:]
index2 = normp.find(sep, index1 + 1)
if index2 == -1:
index2 = len(p)
if index2 - index1 == 1:
return p[:index1], p[index1:]
return p[:index2], p[index2:]
return p[:0], p


Expand Down