From 0d47fdf6e83b2eda16254d3368366215e6c4f73a Mon Sep 17 00:00:00 2001 From: Daniel Grana Date: Tue, 3 Mar 2009 15:18:17 +0000 Subject: [PATCH] utils: revert canonicalize_url implementation, it wasnt intended to be changed --HG-- extra : convert_revision : svn%3Ab85faa78-f9eb-468e-a121-7cced6da292c%40961 --- scrapy/trunk/scrapy/utils/url.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/scrapy/trunk/scrapy/utils/url.py b/scrapy/trunk/scrapy/utils/url.py index 2ec8ee63f..62f02af83 100644 --- a/scrapy/trunk/scrapy/utils/url.py +++ b/scrapy/trunk/scrapy/utils/url.py @@ -145,11 +145,10 @@ def canonicalize_url(url, keep_blank_values=True, keep_fragments=False): """ url = unicode_to_str(url) - parts = list(urlparse.urlparse(url)) - keyvals = cgi.parse_qsl(parts[4], keep_blank_values) + scheme, netloc, path, params, query, fragment = urlparse.urlparse(url) + keyvals = cgi.parse_qsl(query, keep_blank_values) keyvals.sort() - parts[2] = urllib.quote(urllib.unquote(parts[2])) - parts[4] = urllib.urlencode(keyvals) - if not keep_fragments: - parts[5] = '' - return urlparse.urlunparse(parts) + query = urllib.urlencode(keyvals) + path = urllib.quote(urllib.unquote(path)) + fragment = '' if not keep_fragments else fragment + return urlparse.urlunparse((scheme, netloc, path, params, query, fragment))