Skip to content

bpo-33898: Fix pathlib issues with Windows device paths #8671

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

Closed
AlbinaGiliazova wants to merge 17 commits into from
Closed

bpo-33898: Fix pathlib issues with Windows device paths #8671

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
245381a
Update pathlib.py
AlbinaGiliazova Aug 4, 2018
2ed69c3
bpo-33898: Fix pathlib issues
AlbinaGiliazova Aug 4, 2018
9f6cf13
Create 2018-08-04-15-04-10.bpo-33898.psrYKd.rst
AlbinaGiliazova Aug 4, 2018
2a3c396
Merge pull request #2 from AlbinaGiliazova/Info-entry
AlbinaGiliazova Aug 4, 2018
993d016
Whitespace check
AlbinaGiliazova Aug 4, 2018
c34a192
More whitespace
AlbinaGiliazova Aug 4, 2018
7bd8f58
Again whitespace
AlbinaGiliazova Aug 5, 2018
cd128fa
Update pathlib.py
AlbinaGiliazova Aug 5, 2018
fde7f88
Delete pathlib.py
AlbinaGiliazova Aug 5, 2018
3fc6092
no .upper()
AlbinaGiliazova Aug 5, 2018
af842d3
Update pathlib.py
AlbinaGiliazova Aug 9, 2018
b6b8f2c
whitespace
AlbinaGiliazova Aug 9, 2018
f4a0ef0
whitespace
AlbinaGiliazova Aug 9, 2018
8d050b8
fix
AlbinaGiliazova Aug 9, 2018
4a5d84d
Update pathlib.py
AlbinaGiliazova Aug 10, 2018
4dc62db
Apply code review feedback
zooba Mar 7, 2019
14bed13
Fixes indentation
zooba Mar 7, 2019
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 pathlib.py
  • Loading branch information
@AlbinaGiliazova
AlbinaGiliazova authored Aug 10, 2018
commit 4a5d84d9279b4d783e93c9c91640a3091cfa79fd
16 changes: 9 additions & 7 deletions Lib/pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def splitroot(self, part, sep=sep):
prefix = ''
third = part[2:3]
if (second == sep and first == sep and third != sep):
# is a UNC path:
# is a UNC and/or Global path:
# vvvvvvvvvvvvvvvvvvvvv root
# \\machine\mountpoint\directory\etc\...
# directory ^^^^^^^^^^^^^^
Expand All @@ -164,10 +164,11 @@ def splitroot(self, part, sep=sep):
drv = part[:2]
part = part[2:]
first = third
# Except for "UNC" and "Global" paths, the drive should be
# Except for UNC and Global paths, the drive should be
# the first component after the local-device prefix.
# See https://bugs.python.org/issue33898
elif part != sep and prefix and 'UNC' not in prefix and 'Global' not in prefix:
# All UNC and some of Global paths are parsed in if-condition above.
elif part != sep and prefix and 'global' not in self.casefold(prefix):
index = part.find(sep)
if index != -1:
drv = part[:index]
Expand All @@ -183,6 +184,7 @@ def splitroot(self, part, sep=sep):
return prefix + drv, root, part

def casefold(self, s):
# .lower() is not recommended. See https://bugs.python.org/issue32612
return s.lower()

def casefold_parts(self, parts):
Expand Down Expand Up @@ -223,20 +225,20 @@ def _split_extended_path(self, s, ext_prefix=ext_namespace_prefix):
# Do not assume case sensitivity.
# See https://docs.microsoft.com/ru-ru/windows/desktop/FileIO/naming-a-file
Comment thread
zooba marked this conversation as resolved.
Outdated
# But .lower() is not recommended. See https://bugs.python.org/issue32612
s1 = s[:index]
if s1 == 'Global' or s1 == 'GLOBAL':
s1 = self.casefold(s[:index])
if s1 == 'global':
Comment thread
zooba marked this conversation as resolved.
Outdated
prefix += s[:6]
# For example, Path('//?/Global/Z:/').drive
Comment thread
zooba marked this conversation as resolved.
Outdated
if s[8:9] == ':':
prefix += s[6:7]
s = s[7:]
# For example, r'\\?\Global\UNC\server\share'
Comment thread
zooba marked this conversation as resolved.
Outdated
elif s[7:10] == 'UNC':
elif self.casefold(s[7:11]) == 'unc\\':
prefix += s[6:10]
s = '\\' + s[10:]
else:
s = '\\' + s[6:]
if s1 == 'UNC':
if s1 == 'unc':
Comment thread
zooba marked this conversation as resolved.
Outdated
prefix += s[:3]
s = '\\' + s[3:]
return prefix, s
Expand Down