Commitd783d7b

authored

GH-126367:url2pathname(): handle NTFS alternate data streams (#131428)

Adjust `url2pathname()` to decode embedded colon characters in WindowsURIs, rather than bailing out with an `OSError`.

1 parent01b5abb commitd783d7bCopy full SHA for d783d7b

File tree

+20

-17

lines changed

+20

-17

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -182,7 +182,9 @@ The :mod:`urllib.request` module defines the following functions:
`182`	`182`	`'C:\\Program Files'`
`183`	`183`
`184`	`184`	`..versionchanged::3.14`
`185`		`- Windows drive letters are no longer converted to uppercase.`
	`185`	+ Windows drive letters are no longer converted to uppercase, and ``:``
	`186`	`+ characters not following a drive letter no longer cause an`
	`187`	+:exc:`OSError` exception to be raised on Windows.
`186`	`188`
`187`	`189`
`188`	`190`	`..function::getproxies()`

Lines changed: 9 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ def url2pathname(url):`
`14`	`14`	`# ///C:/foo/bar/spam.foo`
`15`	`15`	`# become`
`16`	`16`	`# C:\foo\bar\spam.foo`
`17`		`-importstring,urllib.parse`
	`17`	`+importurllib.parse`
`18`	`18`	`ifurl[:3]=='///':`
`19`	`19`	`# URL has an empty authority section, so the path begins on the third`
`20`	`20`	`# character.`
`@@ -25,19 +25,14 @@ def url2pathname(url):`
`25`	`25`	`ifurl[:3]=='///':`
`26`	`26`	`# Skip past extra slash before UNC drive in URL path.`
`27`	`27`	`url=url[1:]`
`28`		`-# Windows itself uses ":" even in URLs.`
`29`		`-url=url.replace(':','\|')`
`30`		`-ifnot'\|'inurl:`
`31`		`-# No drive specifier, just convert slashes`
`32`		`-# make sure not to convert quoted slashes :-)`
`33`		`-returnurllib.parse.unquote(url.replace('/','\\'))`
`34`		`-comp=url.split('\|')`
`35`		`-iflen(comp)!=2orcomp[0][-1]notinstring.ascii_letters:`
`36`		`-error='Bad URL: '+url`
`37`		`-raiseOSError(error)`
`38`		`-drive=comp[0][-1]`
`39`		`-tail=urllib.parse.unquote(comp[1].replace('/','\\'))`
`40`		`-returndrive+':'+tail`
	`28`	`+else:`
	`29`	`+ifurl[:1]=='/'andurl[2:3]in (':','\|'):`
	`30`	`+# Skip past extra slash before DOS drive in URL path.`
	`31`	`+url=url[1:]`
	`32`	`+ifurl[1:2]=='\|':`
	`33`	`+# Older URLs use a pipe after a drive letter`
	`34`	`+url=url[:1]+':'+url[2:]`
	`35`	`+returnurllib.parse.unquote(url.replace('/','\\'))`
`41`	`36`
`42`	`37`	`defpathname2url(p):`
`43`	`38`	`"""OS-specific conversion from a file system path to a relative URL`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1484,6 +1484,7 @@ def test_pathname2url_nonascii(self):`
`1484`	`1484`	`'test specific to Windows pathnames.')`
`1485`	`1485`	`deftest_url2pathname_win(self):`
`1486`	`1486`	`fn=urllib.request.url2pathname`
	`1487`	`+self.assertEqual(fn('/'),'\\')`
`1487`	`1488`	`self.assertEqual(fn('/C:/'),'C:\\')`
`1488`	`1489`	`self.assertEqual(fn("///C\|"),'C:')`
`1489`	`1490`	`self.assertEqual(fn("///C:"),'C:')`
`@@ -1502,8 +1503,10 @@ def test_url2pathname_win(self):`
`1502`	`1503`	`self.assertEqual(fn('/C\|/path/to/file'),'C:\\path\\to\\file')`
`1503`	`1504`	`self.assertEqual(fn('///C\|/path/to/file'),'C:\\path\\to\\file')`
`1504`	`1505`	`self.assertEqual(fn("///C\|/foo/bar/spam.foo"),'C:\\foo\\bar\\spam.foo')`
`1505`		`-# Non-ASCII drive letter`
`1506`		`-self.assertRaises(IOError,fn,"///\u00e8\|/")`
	`1506`	`+# Colons in URI`
	`1507`	`+self.assertEqual(fn('///\u00e8\|/'),'\u00e8:\\')`
	`1508`	`+self.assertEqual(fn('//host/share/spam.txt:eggs'),'\\\\host\\share\\spam.txt:eggs')`
	`1509`	`+self.assertEqual(fn('///c:/spam.txt:eggs'),'c:\\spam.txt:eggs')`
`1507`	`1510`	`# UNC paths`
`1508`	`1511`	`self.assertEqual(fn('//server/path/to/file'),'\\\\server\\path\\to\\file')`
`1509`	`1512`	`self.assertEqual(fn('////server/path/to/file'),'\\\\server\\path\\to\\file')`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Fix issue where:func:`urllib.request.url2pathname` raised:exc:`OSError`
	`2`	`+when given a Windows URI containing a colon character not following a drive`
	`3`	`+letter, such as before an NTFS alternate data stream.`

Comments

(0)