diff options
Diffstat (limited to 'Lib/urlparse.py')
| -rw-r--r-- | Lib/urlparse.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Lib/urlparse.py b/Lib/urlparse.py index 1a8151804d..f1e54d35e9 100644 --- a/Lib/urlparse.py +++ b/Lib/urlparse.py @@ -176,10 +176,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: @@ -195,10 +194,9 @@ def urlsplit(url, scheme='', allow_fragments=True): 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: |