Skip to content

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

Remove deprecated TextResponse.body_as_unicode

Eugenio Lacuesta55ae2109c95e
diff --git a/scrapy/http/response/text.py b/scrapy/http/response/text.py
index 27bd55c07..89516b9b6 100644
--- a/scrapy/http/response/text.py
+++ b/scrapy/http/response/text.py
@@ -6,7 +6,6 @@ See documentation in docs/topics/request-response.rst
"""
import json
-import warnings
from contextlib import suppress
from typing import Generator, Tuple
from urllib.parse import urljoin
@@ -16,7 +15,6 @@ 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.exceptions import ScrapyDeprecationWarning
from scrapy.http import Request
from scrapy.http.response import Response
from scrapy.utils.python import memoizemethod_noargs, to_unicode
@@ -66,13 +64,6 @@ class TextResponse(Response):
or self._body_declared_encoding()
)
- def body_as_unicode(self):
- """Return body as unicode"""
- warnings.warn('Response.body_as_unicode() is deprecated, '
- 'please use Response.text instead.',
- ScrapyDeprecationWarning, stacklevel=2)
- return self.text
-
def json(self):
"""
.. versionadded:: 2.2
diff --git a/tests/test_http_response.py b/tests/test_http_response.py
index 0ec5257e1..2986f884f 100644
--- a/tests/test_http_response.py
+++ b/tests/test_http_response.py
@@ -1,10 +1,8 @@
import unittest
from unittest import mock
-from warnings import catch_warnings, filterwarnings
from w3lib.encoding import resolve_encoding
-from scrapy.exceptions import ScrapyDeprecationWarning
from scrapy.http import (Request, Response, TextResponse, HtmlResponse,
XmlResponse, Headers)
from scrapy.selector import Selector
@@ -134,9 +132,6 @@ class BaseResponseTest(unittest.TestCase):
assert isinstance(response.text, str)
self._assert_response_encoding(response, encoding)
self.assertEqual(response.body, body_bytes)
- with catch_warnings():
- filterwarnings("ignore", category=ScrapyDeprecationWarning)
- self.assertEqual(response.body_as_unicode(), body_unicode)
self.assertEqual(response.text, body_unicode)
def _assert_response_encoding(self, response, encoding):
@@ -346,12 +341,6 @@ class TextResponseTest(BaseResponseTest):
original_string = unicode_string.encode('cp1251')
r1 = self.response_class('http://www.example.com', body=original_string, encoding='cp1251')
- # check body_as_unicode
- with catch_warnings():
- filterwarnings("ignore", category=ScrapyDeprecationWarning)
- self.assertTrue(isinstance(r1.body_as_unicode(), str))
- self.assertEqual(r1.body_as_unicode(), unicode_string)
-
# check response.text
self.assertTrue(isinstance(r1.text, str))
self.assertEqual(r1.text, unicode_string)
@@ -683,13 +672,6 @@ class TextResponseTest(BaseResponseTest):
with self.assertRaises(ValueError):
response.follow_all(css='a[href*="example.com"]', xpath='//a[contains(@href, "example.com")]')
- def test_body_as_unicode_deprecation_warning(self):
- with catch_warnings(record=True) as warnings:
- r1 = self.response_class("http://www.example.com", body='Hello', encoding='utf-8')
- self.assertEqual(r1.body_as_unicode(), 'Hello')
- self.assertEqual(len(warnings), 1)
- self.assertEqual(warnings[0].category, ScrapyDeprecationWarning)
-
def test_json_response(self):
json_body = b"""{"ip": "109.187.217.200"}"""
json_response = self.response_class("http://www.example.com", body=json_body)