Skip to content

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__.py
index 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, NotConfigured
from scrapy.utils.httpobj import urlparse_cached
-from scrapy.utils.misc import load_object
+from scrapy.utils.misc import create_instance, load_object
from scrapy.utils.python import without_none_values
from scrapy import signals
diff --cc scrapy/core/downloader/handlers/s3.py
index 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 HTTPDownloadHandler
from scrapy.exceptions import NotConfigured
--from scrapy.utils.httpobj import urlparse_cached
from scrapy.utils.boto import is_botocore
- from .http import HTTPDownloadHandler
-from scrapy.core.downloader.handlers.http import HTTPDownloadHandler
++from scrapy.utils.httpobj import urlparse_cached
def _get_boto_connection():
diff --cc tests/test_downloader_handlers.py
index 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 Spide
from scrapy.http import Headers, Request
from scrapy.http.response.text import TextResponse
from scrapy.responsetypes import responsetypes
-from scrapy.settings import Settings
from scrapy.utils.test import get_crawler, skip_if_no_boto
from scrapy.utils.python import to_bytes
- from scrapy.exceptions import NotConfigured
+ from scrapy.exceptions import NotConfigured, ScrapyDeprecationWarning
from tests.mockserver import MockServer, ssl_context_factory, Echo
from tests.spiders import SingleRequestSpider