diff options
author | Steve Dower <steve.dower@python.org> | 2021-04-23 17:02:47 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-23 17:02:47 (GMT) |
commit | 3513d55a617012002c3f82dbf3cec7ec1abd7090 (patch) | |
tree | 8af292b4e8d90e430de4cde0dc2244ba7e2fe82a /Lib/nturl2path.py | |
parent | 7d37b86ad48368cf93440ca220b758696730d0e5 (diff) | |
download | cpython-3513d55a617012002c3f82dbf3cec7ec1abd7090.zip cpython-3513d55a617012002c3f82dbf3cec7ec1abd7090.tar.gz cpython-3513d55a617012002c3f82dbf3cec7ec1abd7090.tar.bz2 |
bpo-43607: Fix urllib handling of Windows paths with \\?\ prefix (GH-25539)
Diffstat (limited to 'Lib/nturl2path.py')
-rw-r--r-- | Lib/nturl2path.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Lib/nturl2path.py b/Lib/nturl2path.py index 853e660..61852af 100644 --- a/Lib/nturl2path.py +++ b/Lib/nturl2path.py @@ -50,6 +50,14 @@ def pathname2url(p): # becomes # ///C:/foo/bar/spam.foo import urllib.parse + # First, clean up some special forms. We are going to sacrifice + # the additional information anyway + if p[:4] == '\\\\?\\': + p = p[4:] + if p[:4].upper() == 'UNC\\': + p = '\\' + p[4:] + elif p[1:2] != ':': + raise OSError('Bad path: ' + p) if not ':' in p: # No drive specifier, just convert slashes and quote the name if p[:2] == '\\\\': @@ -59,7 +67,7 @@ def pathname2url(p): p = '\\\\' + p components = p.split('\\') return urllib.parse.quote('/'.join(components)) - comp = p.split(':') + comp = p.split(':', maxsplit=2) if len(comp) != 2 or len(comp[0]) > 1: error = 'Bad path: ' + p raise OSError(error) |