mirror of https://github.com/python/cpython.git
bpo-43607: Fix urllib handling of Windows paths with \\?\ prefix (GH-25539)
(cherry picked from commit 3513d55a61
)
Co-authored-by: Steve Dower <steve.dower@python.org>
This commit is contained in:
parent
e259a77f21
commit
04bcfe001c
|
@ -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)
|
||||
|
|
|
@ -1524,6 +1524,24 @@ def test_quoting(self):
|
|||
"url2pathname() failed; %s != %s" %
|
||||
(expect, result))
|
||||
|
||||
@unittest.skipUnless(sys.platform == 'win32',
|
||||
'test specific to the nturl2path functions.')
|
||||
def test_prefixes(self):
|
||||
# Test special prefixes are correctly handled in pathname2url()
|
||||
given = '\\\\?\\C:\\dir'
|
||||
expect = '///C:/dir'
|
||||
result = urllib.request.pathname2url(given)
|
||||
self.assertEqual(expect, result,
|
||||
"pathname2url() failed; %s != %s" %
|
||||
(expect, result))
|
||||
given = '\\\\?\\unc\\server\\share\\dir'
|
||||
expect = '/server/share/dir'
|
||||
result = urllib.request.pathname2url(given)
|
||||
self.assertEqual(expect, result,
|
||||
"pathname2url() failed; %s != %s" %
|
||||
(expect, result))
|
||||
|
||||
|
||||
@unittest.skipUnless(sys.platform == 'win32',
|
||||
'test specific to the urllib.url2path function.')
|
||||
def test_ntpath(self):
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
:mod:`urllib` can now convert Windows paths with ``\\?\`` prefixes into URL
|
||||
paths.
|
Loading…
Reference in New Issue