From 33a7c1d4380944d0a6e2efc017b85b1341fc72a3 Mon Sep 17 00:00:00 2001 From: VKen Date: Fri, 3 Oct 2014 04:16:21 +0800 Subject: [PATCH] updated deprecated cgi.parse_qsl to use six's parse_qsl --- scrapy/utils/url.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scrapy/utils/url.py b/scrapy/utils/url.py index ab4d75f87..36490a39d 100644 --- a/scrapy/utils/url.py +++ b/scrapy/utils/url.py @@ -6,9 +6,9 @@ Some of the functions that used to be imported from this module have been moved to the w3lib.url module. Always import those from there instead. """ import posixpath -from six.moves.urllib.parse import ParseResult, urlunparse, urldefrag, urlparse +from six.moves.urllib.parse import (ParseResult, urlunparse, urldefrag, + urlparse, parse_qsl) import urllib -import cgi # scrapy.utils.url was moved to w3lib.url and import * ensures this move doesn't break old code from w3lib.url import * @@ -54,7 +54,7 @@ def canonicalize_url(url, keep_blank_values=True, keep_fragments=False, """ scheme, netloc, path, params, query, fragment = parse_url(url) - keyvals = cgi.parse_qsl(query, keep_blank_values) + keyvals = parse_qsl(query, keep_blank_values) keyvals.sort() query = urllib.urlencode(keyvals) path = safe_url_string(_unquotepath(path)) or '/'