mirror of
https://github.com/python/cpython.git
synced 2025-11-04 11:49:12 +00:00
5bb059fe60
When handed an absolute Windows path such as `C:\foo` or `//server/share`, the `urllib.request.pathname2url()` function returns a URL with an authority section, such as `///C:/foo` or `//server/share` (or before GH-126205, `////server/share`). Only the `file:` prefix is omitted. But when handed an absolute POSIX path such as `/etc/hosts`, or a Windows path of the same form (rooted but lacking a drive), the function returns a URL without an authority section, such as `/etc/hosts`. This patch corrects the discrepancy by adding a `//` prefix before drive-less, rooted paths when generating URLs.
71 lines
2.4 KiB
Python
71 lines
2.4 KiB
Python
"""Convert a NT pathname to a file URL and vice versa.
|
|
|
|
This module only exists to provide OS-specific code
|
|
for urllib.requests, thus do not use directly.
|
|
"""
|
|
# Testing is done through test_urllib.
|
|
|
|
def url2pathname(url):
|
|
"""OS-specific conversion from a relative URL of the 'file' scheme
|
|
to a file system path; not recommended for general use."""
|
|
# e.g.
|
|
# ///C|/foo/bar/spam.foo
|
|
# and
|
|
# ///C:/foo/bar/spam.foo
|
|
# become
|
|
# C:\foo\bar\spam.foo
|
|
import string, urllib.parse
|
|
if url[:3] == '///':
|
|
# URL has an empty authority section, so the path begins on the third
|
|
# character.
|
|
url = url[2:]
|
|
elif url[:12] == '//localhost/':
|
|
# Skip past 'localhost' authority.
|
|
url = url[11:]
|
|
if url[:3] == '///':
|
|
# Skip past extra slash before UNC drive in URL path.
|
|
url = url[1:]
|
|
# Windows itself uses ":" even in URLs.
|
|
url = url.replace(':', '|')
|
|
if not '|' in url:
|
|
# No drive specifier, just convert slashes
|
|
# make sure not to convert quoted slashes :-)
|
|
return urllib.parse.unquote(url.replace('/', '\\'))
|
|
comp = url.split('|')
|
|
if len(comp) != 2 or comp[0][-1] not in string.ascii_letters:
|
|
error = 'Bad URL: ' + url
|
|
raise OSError(error)
|
|
drive = comp[0][-1]
|
|
tail = urllib.parse.unquote(comp[1].replace('/', '\\'))
|
|
return drive + ':' + tail
|
|
|
|
def pathname2url(p):
|
|
"""OS-specific conversion from a file system path to a relative URL
|
|
of the 'file' scheme; not recommended for general use."""
|
|
# e.g.
|
|
# C:\foo\bar\spam.foo
|
|
# becomes
|
|
# ///C:/foo/bar/spam.foo
|
|
import ntpath
|
|
import urllib.parse
|
|
# First, clean up some special forms. We are going to sacrifice
|
|
# the additional information anyway
|
|
p = p.replace('\\', '/')
|
|
if p[:4] == '//?/':
|
|
p = p[4:]
|
|
if p[:4].upper() == 'UNC/':
|
|
p = '//' + p[4:]
|
|
drive, root, tail = ntpath.splitroot(p)
|
|
if drive:
|
|
if drive[1:] == ':':
|
|
# DOS drive specified. Add three slashes to the start, producing
|
|
# an authority section with a zero-length authority, and a path
|
|
# section starting with a single slash.
|
|
drive = f'///{drive}'
|
|
drive = urllib.parse.quote(drive, safe='/:')
|
|
elif root:
|
|
# Add explicitly empty authority to path beginning with one slash.
|
|
root = f'//{root}'
|
|
|
|
tail = urllib.parse.quote(tail)
|
|
return drive + root + tail
|