Scrapy, a fast high-level web crawling & scraping framework for Python.
Merge remote-tracking branch 'upstream/master' into remove-six-code
Eugenio Lacuesta5bab3c026144
diff --cc scrapy/extensions/httpcache.pyindex b98ec218f,11403957c..91850683f--- a/scrapy/extensions/httpcache.py+++ b/scrapy/extensions/httpcache.py@@@ -5,12 -6,11 +5,10 @@@ import picklfrom email.utils import mktime_tz, parsedate_tzfrom importlib import import_modulefrom time import time- from warnings import warnfrom weakref import WeakKeyDictionary-from six.moves import cPickle as picklefrom w3lib.http import headers_raw_to_dict, headers_dict_to_raw- from scrapy.exceptions import ScrapyDeprecationWarningfrom scrapy.http import Headers, Responsefrom scrapy.responsetypes import responsetypesfrom scrapy.utils.httpobj import urlparse_cacheddiff --cc tests/mockserver.pyindex 71fabae0c,7ebb8bb62..fe28176d4--- a/tests/mockserver.py+++ b/tests/mockserver.py@@@ -2,11 -2,10 +2,10 @@@ import jsoimport osimport randomimport sys- import timefrom subprocess import Popen, PIPE+from urllib.parse import urlencodefrom OpenSSL import SSL-from six.moves.urllib.parse import urlencodefrom twisted.web.server import Site, NOT_DONE_YETfrom twisted.web.resource import Resourcefrom twisted.web.static import Filediff --cc tests/test_proxy_connect.pyindex 7a7ec4281,277455751..5f68cd448--- a/tests/test_proxy_connect.py+++ b/tests/test_proxy_connect.py@@@ -1,19 -1,20 +1,20 @@@import jsonimport osimport re-from subprocess import Popen, PIPEimport sys- from urllib.parse import urlsplit, urlunsplit+from subprocess import Popen, PIPE++from urllib.parse import urlsplit, urlunsplitimport pytest-from six.moves.urllib.parse import urlsplit, urlunsplitfrom testfixtures import LogCapture-from twisted.internet import deferfrom twisted.trial.unittest import TestCase--from scrapy.utils.test import get_crawlerfrom scrapy.http import Request--from tests.spiders import SimpleSpider, SingleRequestSpider++from scrapy.utils.test import get_crawler++from tests.mockserver import MockServer++from tests.spiders import SimpleSpider, SingleRequestSpiderclass MitmProxy:diff --cc tests/test_utils_url.pyindex c358f5b82,c7bcaf88b..21e9a056a--- a/tests/test_utils_url.py+++ b/tests/test_utils_url.py@@@ -3,11 -3,8 +3,9 @@@ import unittesfrom scrapy.spiders import Spiderfrom scrapy.utils.url import (url_is_from_any_domain, url_is_from_spider,- add_http_if_no_scheme, guess_scheme,- parse_url, strip_url)+ add_http_if_no_scheme, guess_scheme, strip_url)+__doctests__ = ['scrapy.utils.url']