Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 06:10:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.14] GH-137059: url2pathname(): fix support for drive letter in netloc (GH-137060) (#137144)

Browse source 
Co-authored-by: Barney Gale <barney.gale@gmail.com>
This commit is contained in:
Miss Islington (bot) 2025-07-28 21:43:15 +02:00 • committed by GitHub
parent fbc2a0ca9a
commit aeb55ebb07
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_urllib.py
View file

@ -1590,6 +1590,10 @@ def test_url2pathname_resolve_host(self):
def test_url2pathname_win(self): def test_url2pathname_win(self):
fn = urllib.request.url2pathname fn = urllib.request.url2pathname
self.assertEqual(fn('/C:/'), 'C:\\') self.assertEqual(fn('/C:/'), 'C:\\')
self.assertEqual(fn('//C:'), 'C:')
self.assertEqual(fn('//C:/'), 'C:\\')
self.assertEqual(fn('//C:\\'), 'C:\\')
self.assertEqual(fn('//C:80/'), 'C:80\\')
self.assertEqual(fn("///C|"), 'C:') self.assertEqual(fn("///C|"), 'C:')
self.assertEqual(fn("///C:"), 'C:') self.assertEqual(fn("///C:"), 'C:')
self.assertEqual(fn('///C:/'), 'C:\\') self.assertEqual(fn('///C:/'), 'C:\\')

5
Lib/urllib/request.py
View file

@ -1660,7 +1660,10 @@ def url2pathname(url, *, require_scheme=False, resolve_host=False):
if scheme != 'file': if scheme != 'file':
raise URLError("URL is missing a 'file:' scheme") raise URLError("URL is missing a 'file:' scheme")
if os.name == 'nt': if os.name == 'nt':
if not _is_local_authority(authority, resolve_host): if authority[1:2] == ':':
# e.g. file://c:/file.txt
url = authority + url
elif not _is_local_authority(authority, resolve_host):
# e.g. file://server/share/file.txt # e.g. file://server/share/file.txt
url = '//' + authority + url url = '//' + authority + url
elif url[:3] == '///': elif url[:3] == '///':

3
Misc/NEWS.d/next/Library/2025-07-24-00-38-07.gh-issue-137059.fr64oW.rst Normal file
View file

@ -0,0 +1,3 @@
Fix handling of file URLs with a Windows drive letter in the URL authority
by :func:`urllib.request.url2pathname`. This fixes a regression in earlier
pre-releases of Python 3.14.