Scrapy, a fast high-level web crawling & scraping framework for Python.
Merge branch 'master' into from_crawler_downloader_handlers
Eugenio Lacuesta310cc081d0c4
diff --cc scrapy/core/downloader/handlers/__init__.pyindex e8beb2f5a,39a0b1f51..e8c4454d2--- a/scrapy/core/downloader/handlers/__init__.py+++ b/scrapy/core/downloader/handlers/__init__.py@@@ -1,11 -1,12 +1,12 @@@"""Download handlers for different schemes"""import logging+from twisted.internet import defer- import six+from scrapy.exceptions import NotSupported, NotConfiguredfrom scrapy.utils.httpobj import urlparse_cached-from scrapy.utils.misc import load_object+from scrapy.utils.misc import create_instance, load_objectfrom scrapy.utils.python import without_none_valuesfrom scrapy import signalsdiff --cc scrapy/core/downloader/handlers/s3.pyindex 99a3a7925,d6fbd54ee..b35b59f3a--- a/scrapy/core/downloader/handlers/s3.py+++ b/scrapy/core/downloader/handlers/s3.py@@@ -1,9 -1,9 +1,9 @@@- from six.moves.urllib.parse import unquote+ from urllib.parse import unquote++from scrapy.core.downloader.handlers.http import HTTPDownloadHandlerfrom scrapy.exceptions import NotConfigured--from scrapy.utils.httpobj import urlparse_cachedfrom scrapy.utils.boto import is_botocore- from .http import HTTPDownloadHandler-from scrapy.core.downloader.handlers.http import HTTPDownloadHandler++from scrapy.utils.httpobj import urlparse_cacheddef _get_boto_connection():diff --cc tests/test_downloader_handlers.pyindex eff5653f0,ce39f8545..4505f2bf7--- a/tests/test_downloader_handlers.py+++ b/tests/test_downloader_handlers.py@@@ -30,9 -30,10 +30,9 @@@ from scrapy.spiders import Spidefrom scrapy.http import Headers, Requestfrom scrapy.http.response.text import TextResponsefrom scrapy.responsetypes import responsetypes-from scrapy.settings import Settingsfrom scrapy.utils.test import get_crawler, skip_if_no_botofrom scrapy.utils.python import to_bytes- from scrapy.exceptions import NotConfigured+ from scrapy.exceptions import NotConfigured, ScrapyDeprecationWarningfrom tests.mockserver import MockServer, ssl_context_factory, Echofrom tests.spiders import SingleRequestSpider