Remove more API deprecated in 3.1

timhoffm · timhoffm · commit 0ab55c989184 · 2019-12-30T18:44:38.000+01:00
diff --git a/doc/api/next_api_changes/removals.rst b/doc/api/next_api_changes/removals.rst
@@ -51,6 +51,8 @@ Classes and methods
 
 - ``sphinxext.plot_directive.plot_directive()``
   (use the class ``PlotDirective`` instead)
+- ``sphinxext.mathmpl.math_directive()``
+  (use the class ``MathDirective`` instead)
 
 - ``Artist.aname`` property (no replacement)
 - ``Axis.iter_ticks`` (no replacement)
@@ -71,6 +73,25 @@ Classes and methods
 
 - ``text.TextWithDash`` (use ``text.Annotation`` instead)
 
+- ``dates.seconds()`` (no replacement)
+- ``dates.minutes()`` (no replacement)
+- ``dates.hours()`` (no replacement)
+- ``dates.weeks()`` (no replacement)
+
+- ``font_manager.OSXInstalledFonts()`` (no replacement)
+
+- ``mlab.demean()`` (use ``mlab.detrend_mean()`` instead)
+- ``projections.process_projection_requirements()`` (no replacement)
+- ``path.get_paths_extents()``
+  (use ``path.get_path_collection_extents()`` instead)
+
+- ``docstring.Appender`` (no replacement)
+- ``docstring.dedent()`` (use `inspect.getdoc` instead)
+- ``docstring.copy_dedent()``
+  (use ``docstring.copy()`` and `inspect.getdoc` instead)
+
+- ``widgets.SpanSelector.buttonDown`` property (no replacement)
+
 - ``mplot3d.proj3d.line2d()`` (no replacement)
 - ``mplot3d.proj3d.line2d_dist()`` (no replacement)
 - ``mplot3d.proj3d.line2d_seg_dist()`` (no replacement)
@@ -99,7 +120,13 @@ Classes and methods
 - ``axisartist.axislines.Axes.AxisDict``
   (use ``axis_grid1.mpl_axes.Axes.AxisDict`` instead)
 
+- ``testing.decorators.switch_backend()`` (use ``pytest.mark.backend`` instead)
+
 Arguments
 ~~~~~~~~~
 - ``Axes.text()`` / ``pyplot.text()`` do not support the parameter ``withdash``
-  anymore. Use ``Axes.annotate()`` and ``pyplot.annotate()`` instead.
+  anymore. Use ``Axes.annotate()`` and ``pyplot.annotate()`` instead.
+
+Others
+~~~~~~
+- The math text command ``\stackrel`` is removed. Use ``\genfrac`` instead.
diff --git a/lib/matplotlib/dates.py b/lib/matplotlib/dates.py
@@ -162,8 +162,7 @@
            'SecondLocator', 'MicrosecondLocator',
            'rrule', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA', 'SU',
            'YEARLY', 'MONTHLY', 'WEEKLY', 'DAILY',
-           'HOURLY', 'MINUTELY', 'SECONDLY', 'MICROSECONDLY', 'relativedelta',
-           'seconds', 'minutes', 'hours', 'weeks')
+           'HOURLY', 'MINUTELY', 'SECONDLY', 'MICROSECONDLY', 'relativedelta')
 
 
 _log = logging.getLogger(__name__)
@@ -1836,38 +1835,6 @@ def date_ticker_factory(span, tz=None, numticks=5):
     return locator, formatter
 
 
-@cbook.deprecated("3.1")
-def seconds(s):
-    """
-    Return seconds as days.
-    """
-    return s / SEC_PER_DAY
-
-
-@cbook.deprecated("3.1")
-def minutes(m):
-    """
-    Return minutes as days.
-    """
-    return m / MINUTES_PER_DAY
-
-
-@cbook.deprecated("3.1")
-def hours(h):
-    """
-    Return hours as days.
-    """
-    return h / HOURS_PER_DAY
-
-
-@cbook.deprecated("3.1")
-def weeks(w):
-    """
-    Return weeks as days.
-    """
-    return w * DAYS_PER_WEEK
-
-
 class DateConverter(units.ConversionInterface):
     """
     Converter for `datetime.date` and `datetime.datetime` data, or for
diff --git a/lib/matplotlib/docstring.py b/lib/matplotlib/docstring.py
@@ -59,43 +59,6 @@ def from_params(cls, params):
         return result
 
 
-@cbook.deprecated("3.1")
-class Appender:
-    r"""
-    A function decorator that will append an addendum to the docstring
-    of the target function.
-
-    This decorator should be robust even if func.__doc__ is None
-    (for example, if -OO was passed to the interpreter).
-
-    Usage: construct a docstring.Appender with a string to be joined to
-    the original docstring. An optional 'join' parameter may be supplied
-    which will be used to join the docstring and addendum. e.g.
-
-    add_copyright = Appender("Copyright (c) 2009", join='\n')
-
-    @add_copyright
-    def my_dog(has='fleas'):
-        "This docstring will have a copyright below"
-        pass
-    """
-    def __init__(self, addendum, join=''):
-        self.addendum = addendum
-        self.join = join
-
-    def __call__(self, func):
-        docitems = [func.__doc__, self.addendum]
-        func.__doc__ = func.__doc__ and self.join.join(docitems)
-        return func
-
-
-@cbook.deprecated("3.1", alternative="inspect.getdoc()")
-def dedent(func):
-    "Dedent a docstring (if present)"
-    func.__doc__ = func.__doc__ and cbook.dedent(func.__doc__)
-    return func
-
-
 def copy(source):
     "Copy a docstring from another source function (if present)"
     def do_copy(target):
@@ -114,14 +77,3 @@ def dedent_interpd(func):
     """Dedent *func*'s docstring, then interpolate it with ``interpd``."""
     func.__doc__ = inspect.getdoc(func)
     return interpd(func)
-
-
-@cbook.deprecated("3.1", alternative="docstring.copy() and cbook.dedent()")
-def copy_dedent(source):
-    """A decorator that will copy the docstring from the source and
-    then dedent it"""
-    # note the following is ugly because "Python is not a functional
-    # language" - GVR. Perhaps one day, functools.compose will exist.
-    #  or perhaps not.
-    #  http://mail.python.org/pipermail/patches/2007-February/021687.html
-    return lambda target: dedent(copy(source)(target))
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -32,7 +32,6 @@
 from matplotlib.gridspec import GridSpec
 import matplotlib.legend as mlegend
 from matplotlib.patches import Rectangle
-from matplotlib.projections import process_projection_requirements
 from matplotlib.text import Text
 from matplotlib.transforms import (Affine2D, Bbox, BboxTransformTo,
                                    TransformedBbox)
diff --git a/lib/matplotlib/font_manager.py b/lib/matplotlib/font_manager.py
@@ -253,16 +253,6 @@ def win32InstalledFonts(directory=None, fontext='ttf'):
     return [str(path) for path in items if path.suffix.lower() in fontext]
 
 
-@cbook.deprecated("3.1")
-def OSXInstalledFonts(directories=None, fontext='ttf'):
-    """Get list of font files on OS X."""
-    if directories is None:
-        directories = OSXFontDirectories
-    return [path
-            for directory in directories
-            for path in list_fonts(directory, get_fontext_synonyms(fontext))]
-
-
 @lru_cache()
 def _call_fc_list():
     """Cache and list the font filenames known to `fc-list`.
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -3169,16 +3169,6 @@ def dfrac(self, s, loc, toks):
         return self._genfrac('', '', thickness,
                              self._math_style_dict['displaystyle'], num, den)
 
-    @cbook.deprecated("3.1", obj_type="mathtext command",
-                      alternative=r"\genfrac")
-    def stackrel(self, s, loc, toks):
-        assert len(toks) == 1
-        assert len(toks[0]) == 2
-        num, den = toks[0]
-
-        return self._genfrac('', '', 0.0,
-                             self._math_style_dict['textstyle'], num, den)
-
     def binom(self, s, loc, toks):
         assert len(toks) == 1
         assert len(toks[0]) == 2
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -191,28 +191,6 @@ def detrend(x, key=None, axis=None):
             f"'constant', 'mean', 'linear', or a function")
 
 
-@cbook.deprecated("3.1", alternative="detrend_mean")
-def demean(x, axis=0):
-    '''
-    Return x minus its mean along the specified axis.
-
-    Parameters
-    ----------
-    x : array or sequence
-        Array or sequence containing the data
-        Can have any dimensionality
-
-    axis : int
-        The axis along which to take the mean.  See numpy.mean for a
-        description of this argument.
-
-    See Also
-    --------
-    detrend_mean : Same as `demean` except for the default *axis*.
-    '''
-    return detrend_mean(x, axis=axis)
-
-
 def detrend_mean(x, axis=None):
     '''
     Return x minus the mean(x).
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -989,23 +989,3 @@ def get_path_collection_extents(
     return Bbox.from_extents(*_path.get_path_collection_extents(
         master_transform, paths, np.atleast_3d(transforms),
         offsets, offset_transform))
-
-
-@cbook.deprecated("3.1", alternative="get_paths_collection_extents")
-def get_paths_extents(paths, transforms=[]):
-    """
-    Given a sequence of :class:`Path` objects and optional
-    :class:`~matplotlib.transforms.Transform` objects, returns the
-    bounding box that encapsulates all of them.
-
-    *paths* is a sequence of :class:`Path` instances.
-
-    *transforms* is an optional sequence of
-    :class:`~matplotlib.transforms.Affine2D` instances to apply to
-    each path.
-    """
-    from .transforms import Bbox, Affine2D
-    if len(paths) == 0:
-        raise ValueError("No paths provided")
-    return Bbox.from_extents(*_path.get_path_collection_extents(
-        Affine2D(), paths, transforms, [], Affine2D()))
diff --git a/lib/matplotlib/projections/__init__.py b/lib/matplotlib/projections/__init__.py
@@ -1,4 +1,4 @@
-from .. import axes, docstring, cbook
+from .. import axes, docstring
 from .geo import AitoffAxes, HammerAxes, LambertAxes, MollweideAxes
 from .polar import PolarAxes
 from mpl_toolkits.mplot3d import Axes3D
@@ -56,10 +56,5 @@ def get_projection_class(projection=None):
         raise ValueError("Unknown projection %r" % projection)
 
 
-@cbook.deprecated("3.1")
-def process_projection_requirements(figure, *args, **kwargs):
-    return figure._process_projection_requirements(*args, **kwargs)
-
-
 get_projection_names = projection_registry.get_projection_names
 docstring.interpd.update(projection_names=get_projection_names())
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -229,8 +229,8 @@
 ## We are still importing too many things from mlab; more cleanup is needed.
 
 from matplotlib.mlab import (
-    demean, detrend, detrend_linear, detrend_mean, detrend_none,
-    window_hanning, window_none)
+    detrend, detrend_linear, detrend_mean, detrend_none, window_hanning,
+    window_none)
 
 from matplotlib import cbook, mlab, pyplot as plt
 from matplotlib.pyplot import *
diff --git a/lib/matplotlib/sphinxext/mathmpl.py b/lib/matplotlib/sphinxext/mathmpl.py
@@ -31,16 +31,6 @@ def math_role(role, rawtext, text, lineno, inliner,
 math_role.options = {'fontset': fontset_choice}
 
 
-@cbook.deprecated("3.1", alternative="MathDirective")
-def math_directive(name, arguments, options, content, lineno,
-                   content_offset, block_text, state, state_machine):
-    latex = ''.join(content)
-    node = latex_math(block_text)
-    node['latex'] = latex
-    node['fontset'] = options.get('fontset', 'cm')
-    return [node]
-
-
 class MathDirective(Directive):
     has_content = True
     required_arguments = 0
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -439,23 +439,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/tests/test_mlab.py b/lib/matplotlib/tests/test_mlab.py
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
