Issue #11467: Fix urlparse behavior when handling urls which contains scheme

specific part only digits. Patch by Santoso Wijaya.
This commit is contained in:
Senthil Kumaran 2011-04-15 18:07:33 +08:00
parent 1bb18cc39e
commit ddaea1c38a
3 changed files with 17 additions and 7 deletions

View File

@ -196,10 +196,13 @@ class UrlParseTestCase(unittest.TestCase):
#self.checkJoin(RFC1808_BASE, 'http:g', 'http:g') #self.checkJoin(RFC1808_BASE, 'http:g', 'http:g')
#self.checkJoin(RFC1808_BASE, 'http:', 'http:') #self.checkJoin(RFC1808_BASE, 'http:', 'http:')
def test_RFC2368(self):
# Issue 11467: path that starts with a number is not parsed correctly
self.assertEqual(urlparse.urlparse('mailto:1337@example.org'),
('mailto', '', '1337@example.org', '', '', ''))
def test_RFC2396(self): def test_RFC2396(self):
# cases from RFC 2396 # cases from RFC 2396
self.checkJoin(RFC2396_BASE, 'g:h', 'g:h') self.checkJoin(RFC2396_BASE, 'g:h', 'g:h')
self.checkJoin(RFC2396_BASE, 'g', 'http://a/b/c/g') self.checkJoin(RFC2396_BASE, 'g', 'http://a/b/c/g')
self.checkJoin(RFC2396_BASE, './g', 'http://a/b/c/g') self.checkJoin(RFC2396_BASE, './g', 'http://a/b/c/g')

View File

@ -187,11 +187,15 @@ def urlsplit(url, scheme='', allow_fragments=True):
v = SplitResult(scheme, netloc, url, query, fragment) v = SplitResult(scheme, netloc, url, query, fragment)
_parse_cache[key] = v _parse_cache[key] = v
return v return v
if url.endswith(':') or not url[i+1].isdigit(): for c in url[:i]:
for c in url[:i]: if c not in scheme_chars:
if c not in scheme_chars: break
break else:
else: try:
# make sure "url" is not actually a port number (in which case
# "scheme" is really part of the path
_testportnum = int(url[i+1:])
except ValueError:
scheme, url = url[:i].lower(), url[i+1:] scheme, url = url[:i].lower(), url[i+1:]
if url[:2] == '//': if url[:2] == '//':

View File

@ -51,6 +51,9 @@ Core and Builtins
Library Library
------- -------
- Issue #11467: Fix urlparse behavior when handling urls which contains scheme
specific part only digits. Patch by Santoso Wijaya.
- Issue #11474: Fix the bug with url2pathname() handling of '/C|/' on Windows. - Issue #11474: Fix the bug with url2pathname() handling of '/C|/' on Windows.
Patch by Santoso Wijaya. Patch by Santoso Wijaya.