Scrapy, a fast high-level web crawling & scraping framework for Python.
Remove support for HttpCompressionMiddleware subclasses without stats
Laerte Pereira3db438127cb4
diff --git a/scrapy/downloadermiddlewares/httpcompression.py b/scrapy/downloadermiddlewares/httpcompression.pyindex ead426951..7b1d3f829 100644--- a/scrapy/downloadermiddlewares/httpcompression.py+++ b/scrapy/downloadermiddlewares/httpcompression.py@@ -1,11 +1,9 @@import io-import warningsimport zlibfrom scrapy.exceptions import NotConfiguredfrom scrapy.http import Response, TextResponsefrom scrapy.responsetypes import responsetypes-from scrapy.utils.deprecate import ScrapyDeprecationWarningfrom scrapy.utils.gz import gunzipACCEPTED_ENCODINGS = [b"gzip", b"deflate"]@@ -36,18 +34,7 @@ class HttpCompressionMiddleware:def from_crawler(cls, crawler):if not crawler.settings.getbool("COMPRESSION_ENABLED"):raise NotConfigured- try:- return cls(stats=crawler.stats)- except TypeError:- warnings.warn(- "HttpCompressionMiddleware subclasses must either modify "- "their '__init__' method to support a 'stats' parameter or "- "reimplement the 'from_crawler' method.",- ScrapyDeprecationWarning,- )- result = cls()- result.stats = crawler.stats- return result+ return cls(stats=crawler.stats)def process_request(self, request, spider):request.headers.setdefault("Accept-Encoding", b", ".join(ACCEPTED_ENCODINGS))diff --git a/tests/test_downloadermiddleware_httpcompression.py b/tests/test_downloadermiddleware_httpcompression.pyindex 9dad056de..fcbe50e2b 100644--- a/tests/test_downloadermiddleware_httpcompression.py+++ b/tests/test_downloadermiddleware_httpcompression.py@@ -2,7 +2,6 @@ from gzip import GzipFilefrom io import BytesIOfrom pathlib import Pathfrom unittest import SkipTest, TestCase-from warnings import catch_warningsfrom w3lib.encoding import resolve_encoding@@ -10,7 +9,7 @@ from scrapy.downloadermiddlewares.httpcompression import (ACCEPTED_ENCODINGS,HttpCompressionMiddleware,)-from scrapy.exceptions import NotConfigured, ScrapyDeprecationWarning+from scrapy.exceptions import NotConfiguredfrom scrapy.http import HtmlResponse, Request, Responsefrom scrapy.responsetypes import responsetypesfrom scrapy.spiders import Spider@@ -381,20 +380,6 @@ class HttpCompressionSubclassTest(TestCase):super().__init__()crawler = get_crawler(Spider)- with catch_warnings(record=True) as caught_warnings:++ with self.assertRaises(TypeError):HttpCompressionMiddlewareSubclass.from_crawler(crawler)- messages = tuple(- str(warning.message)- for warning in caught_warnings- if warning.category is ScrapyDeprecationWarning- )- self.assertEqual(- messages,- (- (- "HttpCompressionMiddleware subclasses must either modify "- "their '__init__' method to support a 'stats' parameter "- "or reimplement the 'from_crawler' method."- ),- ),- )