Remove functions deprecated in 2.6.0 (#5996)

scrapy/extensions/feedexport.py

@@ -672,21 +672,12 @@ class FeedExporter:
         params["time"] = utc_now.replace(microsecond=0).isoformat().replace(":", "-")
         params["batch_time"] = utc_now.isoformat().replace(":", "-")
         params["batch_id"] = slot.batch_id + 1 if slot is not None else 1
-        original_params = params.copy()
         uripar_function = (
             load_object(uri_params_function)
             if uri_params_function
             else lambda params, _: params
         )
         new_params = uripar_function(params, spider)
-        if new_params is None or original_params != params:
-            warnings.warn(
-                "Modifying the params dictionary in-place in the function defined in "
-                "the FEED_URI_PARAMS setting or in the uri_params key of the FEEDS "
-                "setting is deprecated. The function must return a new dictionary "
-                "instead.",
-                category=ScrapyDeprecationWarning,
-            )
         return new_params if new_params is not None else params
 
     def _load_filter(self, feed_options):

scrapy/squeues.py

@@ -10,7 +10,6 @@ from typing import Union
 
 from queuelib import queue
 
-from scrapy.utils.deprecate import create_deprecated_class
 from scrapy.utils.request import request_from_dict
 
 
@@ -143,32 +142,3 @@ MarshalFifoDiskQueue = _scrapy_serialization_queue(_MarshalFifoSerializationDisk
 MarshalLifoDiskQueue = _scrapy_serialization_queue(_MarshalLifoSerializationDiskQueue)
 FifoMemoryQueue = _scrapy_non_serialization_queue(queue.FifoMemoryQueue)
 LifoMemoryQueue = _scrapy_non_serialization_queue(queue.LifoMemoryQueue)
-
-
-# deprecated queue classes
-_subclass_warn_message = "{cls} inherits from deprecated class {old}"
-_instance_warn_message = "{cls} is deprecated"
-PickleFifoDiskQueueNonRequest = create_deprecated_class(
-    name="PickleFifoDiskQueueNonRequest",
-    new_class=_PickleFifoSerializationDiskQueue,
-    subclass_warn_message=_subclass_warn_message,
-    instance_warn_message=_instance_warn_message,
-)
-PickleLifoDiskQueueNonRequest = create_deprecated_class(
-    name="PickleLifoDiskQueueNonRequest",
-    new_class=_PickleLifoSerializationDiskQueue,
-    subclass_warn_message=_subclass_warn_message,
-    instance_warn_message=_instance_warn_message,
-)
-MarshalFifoDiskQueueNonRequest = create_deprecated_class(
-    name="MarshalFifoDiskQueueNonRequest",
-    new_class=_MarshalFifoSerializationDiskQueue,
-    subclass_warn_message=_subclass_warn_message,
-    instance_warn_message=_instance_warn_message,
-)
-MarshalLifoDiskQueueNonRequest = create_deprecated_class(
-    name="MarshalLifoDiskQueueNonRequest",
-    new_class=_MarshalLifoSerializationDiskQueue,
-    subclass_warn_message=_subclass_warn_message,
-    instance_warn_message=_instance_warn_message,
-)

scrapy/utils/reqser.py

@@ -1,27 +0,0 @@
-import warnings
-from typing import Optional
-
-import scrapy
-from scrapy.exceptions import ScrapyDeprecationWarning
-from scrapy.utils.request import request_from_dict as _from_dict
-
-warnings.warn(
-    (
-        "Module scrapy.utils.reqser is deprecated, please use request.to_dict method"
-        " and/or scrapy.utils.request.request_from_dict instead"
-    ),
-    category=ScrapyDeprecationWarning,
-    stacklevel=2,
-)
-
-
-def request_to_dict(
-    request: "scrapy.Request", spider: Optional["scrapy.Spider"] = None
-) -> dict:
-    return request.to_dict(spider=spider)
-
-
-def request_from_dict(
-    d: dict, spider: Optional["scrapy.Spider"] = None
-) -> "scrapy.Request":
-    return _from_dict(d, spider=spider)

tests/test_feedexport.py

@@ -3067,10 +3067,7 @@ class URIParamsTest:
         spider = scrapy.Spider(self.spider_name)
         spider.crawler = crawler
 
-        with pytest.warns(
-            ScrapyDeprecationWarning, match="Modifying the params dictionary in-place"
-        ):
-            feed_exporter.open_spider(spider)
+        feed_exporter.open_spider(spider)
 
         self.assertEqual(feed_exporter.slots[0].uri, f"file:///tmp/{self.spider_name}")
 

tests/test_request_dict.py

@@ -1,10 +1,6 @@
-import sys
 import unittest
-import warnings
-from contextlib import suppress
 
 from scrapy import Request, Spider
-from scrapy.exceptions import ScrapyDeprecationWarning
 from scrapy.http import FormRequest, JsonRequest
 from scrapy.utils.request import request_from_dict
 
@@ -162,30 +158,6 @@ class RequestSerializationTest(unittest.TestCase):
         self.assertRaises(ValueError, request_from_dict, d, spider=Spider("foo"))
 
 
-class DeprecatedMethodsRequestSerializationTest(RequestSerializationTest):
-    def _assert_serializes_ok(self, request, spider=None):
-        with warnings.catch_warnings(record=True) as caught:
-            warnings.simplefilter("always")
-            with suppress(KeyError):
-                del sys.modules[
-                    "scrapy.utils.reqser"
-                ]  # delete module to reset the deprecation warning
-
-            from scrapy.utils.reqser import request_from_dict as _from_dict
-            from scrapy.utils.reqser import request_to_dict as _to_dict
-
-            request_copy = _from_dict(_to_dict(request, spider), spider)
-            self._assert_same_request(request, request_copy)
-
-            self.assertEqual(len(caught), 1)
-            self.assertTrue(issubclass(caught[0].category, ScrapyDeprecationWarning))
-            self.assertEqual(
-                "Module scrapy.utils.reqser is deprecated, please use request.to_dict method"
-                " and/or scrapy.utils.request.request_from_dict instead",
-                str(caught[0].message),
-            )
-
-
 class TestSpiderMixin:
     def __mixin_callback(self, response):
         pass