RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use six.PY2 also for conditional imports

This commit is contained in:
Paul Tremberth 2016-04-26 16:14:15 +02:00
parent 25401fd322
commit efbe75ea5e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scrapy/utils/url.py
View File

@ -11,7 +11,7 @@ import six
from six.moves.urllib.parse import (ParseResult, urlunparse, urldefrag, from six.moves.urllib.parse import (ParseResult, urlunparse, urldefrag,
urlparse, parse_qsl, urlencode, urlparse, parse_qsl, urlencode,
quote, unquote) quote, unquote)
if six.PY3: if not six.PY2:
from urllib.parse import unquote_to_bytes from urllib.parse import unquote_to_bytes
# scrapy.utils.url was moved to w3lib.url and import * ensures this # 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)) return urlparse(to_unicode(url, encoding))
if six.PY3: if not six.PY2:
from urllib.parse import _coerce_args, unquote_to_bytes from urllib.parse import _coerce_args, unquote_to_bytes
def parse_qsl_to_bytes(qs, keep_blank_values=False, strict_parsing=False): def parse_qsl_to_bytes(qs, keep_blank_values=False, strict_parsing=False):