Remove testing and doc API deprecated in 3.3.

QuLogic · QuLogic · commit aec7bb432aa4 · 2021-06-29T05:28:57.000-04:00
diff --git a/doc/api/next_api_changes/removals/20465-ES.rst b/doc/api/next_api_changes/removals/20465-ES.rst
@@ -59,3 +59,16 @@ Path helpers
 
 ``.BboxBase.inverse_transformed`` has been removed (call `.BboxBase.transformed`
 on the `~.Transform.inverted()` transform instead).
+
+``matplotlib.test(recursionlimit=...)``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The *recursionlimit* parameter of `matplotlib.test` has been removed.
+
+``testing.compare.make_external_conversion_command``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+... has been removed.
+
+``docstring.Substitution.from_params``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+This method has been removed.  If needed, directly assign to the ``params``
+attribute of the Substitution object.
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1174,8 +1174,7 @@ def _init_tests():
                 "" if ft2font.__freetype_build_type__ == 'local' else "not "))
 
 
-@_api.delete_parameter("3.3", "recursionlimit")
-def test(verbosity=None, coverage=False, *, recursionlimit=0, **kwargs):
+def test(verbosity=None, coverage=False, **kwargs):
     """Run the matplotlib test suite."""
 
     try:
@@ -1192,8 +1191,6 @@ def test(verbosity=None, coverage=False, *, recursionlimit=0, **kwargs):
     old_recursionlimit = sys.getrecursionlimit()
     try:
         use('agg')
-        if recursionlimit:
-            sys.setrecursionlimit(recursionlimit)
 
         args = kwargs.pop('argv', [])
         provide_default_modules = True
@@ -1222,8 +1219,6 @@ def test(verbosity=None, coverage=False, *, recursionlimit=0, **kwargs):
     finally:
         if old_backend.lower() != 'agg':
             use(old_backend)
-        if recursionlimit:
-            sys.setrecursionlimit(old_recursionlimit)
 
     return retcode
 
diff --git a/lib/matplotlib/docstring.py b/lib/matplotlib/docstring.py
@@ -1,7 +1,5 @@
 import inspect
 
-from matplotlib import _api
-
 
 class Substitution:
     """
@@ -46,21 +44,6 @@ def update(self, *args, **kwargs):
         """
         self.params.update(*args, **kwargs)
 
-    @classmethod
-    @_api.deprecated("3.3", alternative="assign to the params attribute")
-    def from_params(cls, params):
-        """
-        In the case where the params is a mutable sequence (list or
-        dictionary) and it may change before this class is called, one may
-        explicitly use a reference to the params rather than using *args or
-        **kwargs which will copy the values and not reference them.
-
-        :meta private:
-        """
-        result = cls()
-        result.params = params
-        return result
-
 
 def _recursive_subclasses(cls):
     yield cls
diff --git a/lib/matplotlib/testing/compare.py b/lib/matplotlib/testing/compare.py
@@ -19,7 +19,7 @@
 from PIL import Image
 
 import matplotlib as mpl
-from matplotlib import _api, cbook
+from matplotlib import cbook
 from matplotlib.testing.exceptions import ImageComparisonFailure
 
 _log = logging.getLogger(__name__)
@@ -64,25 +64,6 @@ def get_file_hash(path, block_size=2 ** 20):
     return md5.hexdigest()
 
 
-@_api.deprecated("3.3")
-def make_external_conversion_command(cmd):
-    def convert(old, new):
-        cmdline = cmd(old, new)
-        pipe = subprocess.Popen(cmdline, universal_newlines=True,
-                                stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = pipe.communicate()
-        errcode = pipe.wait()
-        if not os.path.exists(new) or errcode:
-            msg = "Conversion command failed:\n%s\n" % ' '.join(cmdline)
-            if stdout:
-                msg += "Standard output:\n%s\n" % stdout
-            if stderr:
-                msg += "Standard error:\n%s\n" % stderr
-            raise IOError(msg)
-
-    return convert
-
-
 # Modified from https://bugs.python.org/issue25567.
 _find_unsafe_bytes = re.compile(br'[^a-zA-Z0-9_@%+=:,./-]').search
 
