From efbe75ea5ef862e44ccee6b9410a8317f9fad329 Mon Sep 17 00:00:00 2001 From: Paul Tremberth Date: Tue, 26 Apr 2016 16:14:15 +0200 Subject: [PATCH] Use six.PY2 also for conditional imports --- scrapy/utils/url.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scrapy/utils/url.py b/scrapy/utils/url.py index 069666dbc..c80fc6e70 100644 --- a/scrapy/utils/url.py +++ b/scrapy/utils/url.py @@ -11,7 +11,7 @@ import six from six.moves.urllib.parse import (ParseResult, urlunparse, urldefrag, urlparse, parse_qsl, urlencode, quote, unquote) -if six.PY3: +if not six.PY2: from urllib.parse import unquote_to_bytes # scrapy.utils.url was moved to w3lib.url and import * ensures this @@ -157,7 +157,7 @@ def parse_url(url, encoding=None): return urlparse(to_unicode(url, encoding)) -if six.PY3: +if not six.PY2: from urllib.parse import _coerce_args, unquote_to_bytes def parse_qsl_to_bytes(qs, keep_blank_values=False, strict_parsing=False):