Remove functions/methods deprecated in 3.1.

QuLogic · QuLogic · commit 2088794fae62 · 2020-04-25T01:30:29.000-04:00
diff --git a/doc/api/api_changes_3.3/removals.rst b/doc/api/api_changes_3.3/removals.rst
@@ -87,6 +87,8 @@ Classes, methods and attributes
 
 - ``path.get_paths_extents()``
   (use ``path.get_path_collection_extents()`` instead)
+- ``path.Path.has_nonfinite()`` (use ``not np.isfinite(self.vertices).all()``
+  instead)
 
 - ``projections.process_projection_requirements()`` (no replacement)
 
@@ -111,6 +113,7 @@ Classes, methods and attributes
 - ``scale.InvertedLog2Transform`` (use ``scale.InvertedLogTransform`` instead)
 - ``scale.NaturalLogTransform`` (use ``scale.LogTransform`` instead)
 - ``scale.InvertedNaturalLogTransform`` (use ``scale.InvertedLogTransform`` instead)
+- ``scale.get_scale_docs()`` (no replacement)
 
 - ``sphinxext.plot_directive.plot_directive()``
   (use the class ``PlotDirective`` instead)
@@ -119,12 +122,18 @@ Classes, methods and attributes
 
 - ``spines.Spine.is_frame_like()`` (no replacement)
 
+- ``testing.decorators.switch_backend()`` (use ``@pytest.mark.backend``
+  decorator instead)
+
 - ``text.Text.is_math_text()`` (use ``cbook.is_math_text()`` instead)
 - ``text.TextWithDash()`` (use ``text.Annotation`` instead)
 - ``textpath.TextPath.is_math_text()`` (use ``cbook.is_math_text()`` instead)
 - ``textpath.TextPath.text_get_vertices_codes()``
   (use ``textpath.text_to_path.get_text_path()`` instead)
 
+- ``textpath.TextToPath.glyph_to_path()`` (use ``font.get_path()`` and manual
+  translation of the vertices instead)
+
 - ``ticker.OldScalarFormatter.pprint_val()`` (no replacement)
 - ``ticker.ScalarFormatter.pprint_val()`` (no replacement)
 - ``ticker.LogFormatter.pprint_val()`` (no replacement)
diff --git a/doc/api/prev_api_changes/api_changes_3.1.0.rst b/doc/api/prev_api_changes/api_changes_3.1.0.rst
@@ -849,8 +849,8 @@ Use the standard library's docstring manipulation tools instead, such as
 
 
 
-- `matplotlib.scale.get_scale_docs()`
-- `matplotlib.pyplot.get_scale_docs()`
+- ``matplotlib.scale.get_scale_docs()``
+- ``matplotlib.pyplot.get_scale_docs()``
 
 These are considered internal and will be removed from the public API in a
 future version.
@@ -905,7 +905,8 @@ Font Handling
 - ``backend_pdf.RendererPdf.afm_font_cache``
 - ``backend_ps.RendererPS.afmfontd``
 - ``font_manager.OSXInstalledFonts``
-- `.TextToPath.glyph_to_path` (Instead call ``font.get_path()`` and manually transform the path.)
+- ``.TextToPath.glyph_to_path`` (Instead call ``font.get_path()`` and manually
+  transform the path.)
 
 
 Date related functions
@@ -1011,7 +1012,7 @@ Path tools
 
 Use `~.path.get_path_collection_extents` instead.
 
-- `.Path.has_nonfinite` attribute
+- ``.Path.has_nonfinite`` attribute
 
 Use ``not np.isfinite(path.vertices).all()`` instead.
 
diff --git a/doc/missing-references.json b/doc/missing-references.json
@@ -1369,9 +1369,6 @@
     "matplotlib.patches.Patch.__init__": [
       "doc/devel/documenting_mpl.rst:696"
     ],
-    "matplotlib.pyplot.get_scale_docs()": [
-      "doc/api/prev_api_changes/api_changes_3.1.0.rst:853"
-    ],
     "matplotlib.sphinxext.mathmpl": [
       "doc/users/prev_whats_new/whats_new_3.0.rst:225"
     ],
@@ -1543,4 +1540,4 @@
       "lib/mpl_toolkits/mplot3d/axes3d.py:docstring of mpl_toolkits.mplot3d.axes3d.Axes3D.get_ylim3d:24"
     ]
   }
-}
+}
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -243,15 +243,6 @@ def simplify_threshold(self):
     def simplify_threshold(self, threshold):
         self._simplify_threshold = threshold
 
-    @cbook.deprecated(
-        "3.1", alternative="not np.isfinite(self.vertices).all()")
-    @property
-    def has_nonfinite(self):
-        """
-        `True` if the vertices array has nonfinite values.
-        """
-        return not np.isfinite(self._vertices).all()
-
     @property
     def should_simplify(self):
         """
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -48,7 +48,7 @@
 from matplotlib.axes import Axes, Subplot
 from matplotlib.projections import PolarAxes
 from matplotlib import mlab  # for detrend_none, window_hanning
-from matplotlib.scale import get_scale_docs, get_scale_names
+from matplotlib.scale import get_scale_names
 
 from matplotlib import cm
 from matplotlib.cm import get_cmap, register_cmap
diff --git a/lib/matplotlib/scale.py b/lib/matplotlib/scale.py
@@ -667,16 +667,6 @@ def register_scale(scale_class):
     _scale_mapping[scale_class.name] = scale_class
 
 
-@cbook.deprecated(
-    '3.1', message='get_scale_docs() is considered private API since '
-                   '3.1 and will be removed from the public API in 3.3.')
-def get_scale_docs():
-    """
-    Helper function for generating docstrings related to scales.
-    """
-    return _get_scale_docs()
-
-
 def _get_scale_docs():
     """
     Helper function for generating docstrings related to scales.
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -459,23 +459,3 @@ def _image_directories(func):
     result_dir = Path().resolve() / "result_images" / module_path.stem
     result_dir.mkdir(parents=True, exist_ok=True)
     return baseline_dir, result_dir
-
-
-@cbook.deprecated("3.1", alternative="pytest.mark.backend")
-def switch_backend(backend):
-
-    def switch_backend_decorator(func):
-
-        @functools.wraps(func)
-        def backend_switcher(*args, **kwargs):
-            try:
-                prev_backend = mpl.get_backend()
-                matplotlib.testing.setup()
-                plt.switch_backend(backend)
-                return func(*args, **kwargs)
-            finally:
-                plt.switch_backend(prev_backend)
-
-        return backend_switcher
-
-    return switch_backend_decorator
diff --git a/lib/matplotlib/textpath.py b/lib/matplotlib/textpath.py
@@ -51,16 +51,6 @@ def _get_char_id_ps(self, font, ccode):
         char_id = urllib.parse.quote('%s-%d' % (ps_name, ccode))
         return char_id
 
-    @cbook.deprecated(
-        "3.1",
-        alternative="font.get_path() and manual translation of the vertices")
-    def glyph_to_path(self, font, currx=0.):
-        """Convert the *font*'s current glyph to a (vertices, codes) pair."""
-        verts, codes = font.get_path()
-        if currx != 0.0:
-            verts[:, 0] += currx
-        return verts, codes
-
     def get_text_width_height_descent(self, s, prop, ismath):
         if rcParams['text.usetex']:
             texmanager = self.get_texmanager()
