Remove deprecated code (#5719)

scrapy/utils/boto.py

@@ -1,27 +1,4 @@
 """Boto/botocore helpers"""
-import warnings
-
-from scrapy.exceptions import NotConfigured, ScrapyDeprecationWarning
-
-
-def is_botocore():
-    """ Returns True if botocore is available, otherwise raises NotConfigured. Never returns False.
-
-    Previously, when boto was supported in addition to botocore, this returned False if boto was available
-    but botocore wasn't.
-    """
-    message = (
-        'is_botocore() is deprecated and always returns True or raises an Exception, '
-        'so it cannot be used for checking if boto is available instead of botocore. '
-        'You can use scrapy.utils.boto.is_botocore_available() to check if botocore '
-        'is available.'
-    )
-    warnings.warn(message, ScrapyDeprecationWarning, stacklevel=2)
-    try:
-        import botocore  # noqa: F401
-        return True
-    except ImportError:
-        raise NotConfigured('missing botocore library')
 
 
 def is_botocore_available():

scrapy/utils/gz.py

@@ -2,17 +2,6 @@ import struct
 from gzip import GzipFile
 from io import BytesIO
 
-from scrapy.utils.decorators import deprecated
-
-
-# - GzipFile's read() has issues returning leftover uncompressed data when
-#   input is corrupted
-# - read1(), which fetches data before raising EOFError on next call
-#   works here
-@deprecated('GzipFile.read1')
-def read1(gzf, size=-1):
-    return gzf.read1(size)
-
 
 def gunzip(data):
     """Gunzip the given data and return as much data as possible.

scrapy/utils/python.py

@@ -1,20 +1,16 @@
 """
 This module contains essential stuff that should've come with Python itself ;)
 """
-import errno
 import gc
 import inspect
 import re
 import sys
-import warnings
 import weakref
 from functools import partial, wraps
 from itertools import chain
 from typing import AsyncGenerator, AsyncIterable, Iterable, Union
 
-from scrapy.exceptions import ScrapyDeprecationWarning
 from scrapy.utils.asyncgen import as_async_generator
-from scrapy.utils.decorators import deprecated
 
 
 def flatten(x):
@@ -112,12 +108,6 @@ def to_bytes(text, encoding=None, errors='strict'):
     return text.encode(encoding, errors)
 
 
-@deprecated('to_unicode')
-def to_native_str(text, encoding=None, errors='strict'):
-    """ Return str representation of ``text``. """
-    return to_unicode(text, encoding, errors)
-
-
 def re_rsearch(pattern, text, chunk_size=1024):
     """
     This function does a reverse search in a text using a regular expression
@@ -263,30 +253,6 @@ def equal_attributes(obj1, obj2, attributes):
     return True
 
 
-class WeakKeyCache:
-
-    def __init__(self, default_factory):
-        warnings.warn("The WeakKeyCache class is deprecated", category=ScrapyDeprecationWarning, stacklevel=2)
-        self.default_factory = default_factory
-        self._weakdict = weakref.WeakKeyDictionary()
-
-    def __getitem__(self, key):
-        if key not in self._weakdict:
-            self._weakdict[key] = self.default_factory(key)
-        return self._weakdict[key]
-
-
-@deprecated
-def retry_on_eintr(function, *args, **kw):
-    """Run a function and retry it while getting EINTR errors"""
-    while True:
-        try:
-            return function(*args, **kw)
-        except IOError as e:
-            if e.errno != errno.EINTR:
-                raise
-
-
 def without_none_values(iterable):
     """Return a copy of ``iterable`` with all ``None`` entries removed.
 
@@ -337,10 +303,6 @@ class MutableChain(Iterable):
     def __next__(self):
         return next(self.data)
 
-    @deprecated("scrapy.utils.python.MutableChain.__next__")
-    def next(self):
-        return self.__next__()
-
 
 async def _async_chain(*iterables: Union[Iterable, AsyncIterable]) -> AsyncGenerator:
     for it in iterables:

tests/test_utils_python.py

@@ -1,18 +1,14 @@
 import functools
-import gc
 import operator
 import platform
-from itertools import count
-from warnings import catch_warnings, filterwarnings
 
 from twisted.trial import unittest
 
-from scrapy.exceptions import ScrapyDeprecationWarning
 from scrapy.utils.asyncgen import as_async_generator, collect_asyncgen
 from scrapy.utils.defer import deferred_f_from_coro_f, aiter_errback
 from scrapy.utils.python import (
     memoizemethod_noargs, binary_is_text, equal_attributes,
-    WeakKeyCache, get_func_args, to_bytes, to_unicode,
+    get_func_args, to_bytes, to_unicode,
     without_none_values, MutableChain, MutableAsyncChain)
 
 
@@ -27,12 +23,7 @@ class MutableChainTest(unittest.TestCase):
         m.extend([9, 10], (11, 12))
         self.assertEqual(next(m), 0)
         self.assertEqual(m.__next__(), 1)
-        with catch_warnings(record=True) as warnings:
-            self.assertEqual(m.next(), 2)
-            self.assertEqual(len(warnings), 1)
-            self.assertIn('scrapy.utils.python.MutableChain.__next__',
-                          str(warnings[0].message))
-        self.assertEqual(list(m), list(range(3, 13)))
+        self.assertEqual(list(m), list(range(2, 13)))
 
 
 class MutableAsyncChainTest(unittest.TestCase):
@@ -209,27 +200,6 @@ class UtilsPythonTestCase(unittest.TestCase):
         a.meta['z'] = 2
         self.assertFalse(equal_attributes(a, b, [compare_z, 'x']))
 
-    def test_weakkeycache(self):
-        class _Weakme:
-            pass
-
-        _values = count()
-
-        with catch_warnings():
-            filterwarnings("ignore", category=ScrapyDeprecationWarning)
-            wk = WeakKeyCache(lambda k: next(_values))
-
-        k = _Weakme()
-        v = wk[k]
-        self.assertEqual(v, wk[k])
-        self.assertNotEqual(v, wk[_Weakme()])
-        self.assertEqual(v, wk[k])
-        del k
-        for _ in range(100):
-            if wk._weakdict:
-                gc.collect()
-        self.assertFalse(len(wk._weakdict))
-
     def test_get_func_args(self):
         def f1(a, b, c):
             pass