Skip to content

Scrapy, a fast high-level web crawling & scraping framework for Python.

Merge branch 'master' into response_follow_all

Eugenio Lacuesta21a2f8c6f82e
diff --cc scrapy/http/response/__init__.py
index b9e638551,64e9c6c20..f92d0901c
--- a/scrapy/http/response/__init__.py
+++ b/scrapy/http/response/__init__.py
@@@ -4,16 -4,14 +4,15 @@@ responses in Scrapy
See documentation in docs/topics/request-response.rst
"""
+from typing import Generator
+ from urllib.parse import urljoin
- from six.moves.urllib.parse import urljoin
-
--from scrapy.http.request import Request
++from scrapy.exceptions import NotSupported
++from scrapy.http.common import obsolete_setter
from scrapy.http.headers import Headers
++from scrapy.http.request import Request
from scrapy.link import Link
from scrapy.utils.trackref import object_ref
--from scrapy.http.common import obsolete_setter
--from scrapy.exceptions import NotSupported
class Response(object_ref):
diff --cc scrapy/http/response/text.py
index e3646b2d5,1079fd6e8..09049c157
--- a/scrapy/http/response/text.py
+++ b/scrapy/http/response/text.py
@@@ -10,15 -8,14 +10,14 @@@ from typing import Generato
from urllib.parse import urljoin
import parsel
- import six
-from w3lib.encoding import html_to_unicode, resolve_encoding, \
- html_body_declared_encoding, http_content_type_encoding
+from w3lib.encoding import (html_body_declared_encoding, html_to_unicode,
+ http_content_type_encoding, resolve_encoding)
from w3lib.html import strip_html5_whitespace
-from scrapy.http.request import Request
+from scrapy.http import Request
from scrapy.http.response import Response
-from scrapy.utils.response import get_base_url
from scrapy.utils.python import memoizemethod_noargs, to_unicode
+from scrapy.utils.response import get_base_url
class TextResponse(Response):
@@@ -40,10 -37,10 +39,10 @@@
def _set_body(self, body):
self._body = b'' # used by encoding detection
- if isinstance(body, six.text_type):
+ if isinstance(body, str):
if self._encoding is None:
raise TypeError('Cannot convert unicode body - %s has no encoding' %
- type(self).__name__)
+ type(self).__name__)
self._body = body.encode(self._encoding)
else:
super(TextResponse, self)._set_body(body)