mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-17 04:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 80362 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80362 | senthil.kumaran | 2010-04-22 17:40:13 +0530 (Thu, 22 Apr 2010) | 4 lines

  Changed tests to only urlparse one, which was enough, addressed Ezio's comment
  on Invalid url check statement and versionchanged string in docs.
........
This commit is contained in:
Senthil Kumaran 2010-04-22 12:19:46 +00:00
parent dcb2403022
commit 7a1e09f60c
3 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/urllib/parse.py
View file

@ -181,10 +181,9 @@ def urlsplit(url, scheme='', allow_fragments=True):
url = url[i+1:]
if url[:2] == '//':
netloc, url = _splitnetloc(url, 2)
if '[' in netloc :
if not ']' in netloc: raise ValueError("Invalid IPv6 URL")
if ']' in netloc:
if not '[' in netloc: raise ValueError("Invalid IPv6 URL")
if (('[' in netloc and ']' not in netloc) or
(']' in netloc and '[' not in netloc)):
raise ValueError("Invalid IPv6 URL")
if allow_fragments and '#' in url:
url, fragment = url.split('#', 1)
if '?' in url:
@ -199,10 +198,9 @@ def urlsplit(url, scheme='', allow_fragments=True):
scheme, url = url[:i].lower(), url[i+1:]
if url[:2] == '//':
netloc, url = _splitnetloc(url, 2)
if '[' in netloc:
if not ']' in netloc: raise ValueError("Invalid IPv6 URL")
if ']' in netloc:
if not '[' in netloc: raise ValueError("Invalid IPv6 URL")
if (('[' in netloc and ']' not in netloc) or
(']' in netloc and '[' not in netloc)):
raise ValueError("Invalid IPv6 URL")
if allow_fragments and scheme in uses_fragment and '#' in url:
url, fragment = url.split('#', 1)
if scheme in uses_query and '?' in url: