mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Backed out changeset ee51e3aef302 - it broke the test suite

Browse source
This commit is contained in:
Antoine Pitrou 2012-06-29 21:53:29 +02:00
parent 97ac4a292e
commit 96f2053b13
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/urlparse.py
View file

@ -127,8 +127,8 @@ def urlparse(url, scheme='', allow_fragments=True):
Return a 6-tuple: (scheme, netloc, path, params, query, fragment). Return a 6-tuple: (scheme, netloc, path, params, query, fragment).
Note that we don't break the components up in smaller bits Note that we don't break the components up in smaller bits
(e.g. netloc is a single string) and we don't expand % escapes.""" (e.g. netloc is a single string) and we don't expand % escapes."""
splitresult = urlsplit(url, scheme, allow_fragments) tuple = urlsplit(url, scheme, allow_fragments)
scheme, netloc, url, query, fragment = splitresult scheme, netloc, url, query, fragment = tuple
if scheme in uses_params and ';' in url: if scheme in uses_params and ';' in url:
url, params = _splitparams(url) url, params = _splitparams(url)
else: else:
@ -225,8 +225,7 @@ def urlunsplit(data):
empty query; the RFC states that these are equivalent).""" empty query; the RFC states that these are equivalent)."""
scheme, netloc, url, query, fragment = data scheme, netloc, url, query, fragment = data
if netloc or (scheme and scheme in uses_netloc and url[:2] != '//'): if netloc or (scheme and scheme in uses_netloc and url[:2] != '//'):
if url and url[:1] != '/': if url and url[:1] != '/': url = '/' + url
url = '/' + url
url = '//' + (netloc or '') + url url = '//' + (netloc or '') + url
if scheme: if scheme:
url = scheme + ':' + url url = scheme + ':' + url
@ -345,13 +344,13 @@ def parse_qs(qs, keep_blank_values=0, strict_parsing=0):
If false (the default), errors are silently ignored. If false (the default), errors are silently ignored.
If true, errors raise a ValueError exception. If true, errors raise a ValueError exception.
""" """
parsed_result = {} dict = {}
for name, value in parse_qsl(qs, keep_blank_values, strict_parsing): for name, value in parse_qsl(qs, keep_blank_values, strict_parsing):
if name in dict: if name in dict:
parsed_result[name].append(value) dict[name].append(value)
else: else:
parsed_result[name] = [value] dict[name] = [value]
return parsed_result return dict
def parse_qsl(qs, keep_blank_values=0, strict_parsing=0): def parse_qsl(qs, keep_blank_values=0, strict_parsing=0):
"""Parse a query given as a string argument. """Parse a query given as a string argument.