Remove miscellaneous deprecations.

QuLogic · QuLogic · commit b8fdef77567f · 2020-09-18T20:46:20.000-04:00
diff --git a/doc/api/figure_api.rst b/doc/api/figure_api.rst
@@ -16,7 +16,6 @@ Classes
    :template: autosummary.rst
    :nosignatures:
 
-   AxesStack
    Figure
    SubplotParams
 
diff --git a/doc/api/next_api_changes/removals/18522-ES.rst b/doc/api/next_api_changes/removals/18522-ES.rst
@@ -21,4 +21,19 @@ Formatters) is no longer supported. Pass a factor equal to 1 instead.
 
 Misc
 ~~~~
+``matplotlib.get_home`` has been removed; use standard library instead.
+
+``matplotlib.compare_versions`` has been removed; use comparison of
+``distutils.version.LooseVersion``\s instead.
+
+``matplotlib.checkdep_ps_distiller`` has been removed.
+
+``matplotlib.figure.AxesStack`` has been removed.
+
 ``BboxBase.is_unit`` has been removed; check the `.Bbox` extents if needed.
+
+``Affine2DBase.matrix_from_values(...)`` has been removed; use (for example)
+``Affine2D.from_values(...).get_matrix()`` instead.
+
+``style.core.is_style_file`` and ``style.core.iter_style_files`` have been
+removed.
diff --git a/doc/api/prev_api_changes/api_changes_2.1.0.rst b/doc/api/prev_api_changes/api_changes_2.1.0.rst
@@ -329,7 +329,7 @@ a previous axes instance currently reuses the earlier instance.  This
 behavior has been deprecated in Matplotlib 2.1. In a future version, a
 *new* instance will always be created and returned.  Meanwhile, in such
 a situation, a deprecation warning is raised by
-:class:`~matplotlib.figure.AxesStack`.
+``matplotlib.figure.AxesStack``.
 
 This warning can be suppressed, and the future behavior ensured, by passing
 a *unique* label to each axes instance.  See the docstring of
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -135,23 +135,6 @@
 }"""
 
 
-@cbook.deprecated("3.2")
-def compare_versions(a, b):
-    """Return whether version *a* is greater than or equal to version *b*."""
-    if isinstance(a, bytes):
-        cbook.warn_deprecated(
-            "3.0", message="compare_versions arguments should be strs.")
-        a = a.decode('ascii')
-    if isinstance(b, bytes):
-        cbook.warn_deprecated(
-            "3.0", message="compare_versions arguments should be strs.")
-        b = b.decode('ascii')
-    if a:
-        return LooseVersion(a) >= LooseVersion(b)
-    else:
-        return False
-
-
 def _check_versions():
 
     # Quickfix to ensure Microsoft Visual C++ redistributable
@@ -382,26 +365,6 @@ def impl(args, regex, min_ver=None, ignore_exit_code=False):
         raise ValueError("Unknown executable: {!r}".format(name))
 
 
-@cbook.deprecated("3.2")
-def checkdep_ps_distiller(s):
-    if not s:
-        return False
-    try:
-        _get_executable_info("gs")
-    except ExecutableNotFoundError:
-        _log.warning(
-            "Setting rcParams['ps.usedistiller'] requires ghostscript.")
-        return False
-    if s == "xpdf":
-        try:
-            _get_executable_info("pdftops")
-        except ExecutableNotFoundError:
-            _log.warning(
-                "Setting rcParams['ps.usedistiller'] to 'xpdf' requires xpdf.")
-            return False
-    return s
-
-
 def checkdep_usetex(s):
     if not s:
         return False
@@ -421,20 +384,6 @@ def checkdep_usetex(s):
     return True
 
 
-@cbook.deprecated("3.2", alternative="os.path.expanduser('~')")
-@_logged_cached('$HOME=%s')
-def get_home():
-    """
-    Return the user's home directory.
-
-    If the user's home directory cannot be found, return None.
-    """
-    try:
-        return str(Path.home())
-    except Exception:
-        return None
-
-
 def _get_xdg_config_dir():
     """
     Return the XDG configuration directory, according to the XDG base
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -152,11 +152,6 @@ def __contains__(self, a):
         return a in self.as_list()
 
 
-@cbook.deprecated("3.2")
-class AxesStack(_AxesStack):
-    pass
-
-
 class SubplotParams:
     """
     A class to hold the parameters for a subplot.
diff --git a/lib/matplotlib/style/core.py b/lib/matplotlib/style/core.py
@@ -55,12 +55,6 @@ def _remove_blacklisted_style_params(d, warn=True):
     return o
 
 
-@cbook.deprecated("3.2")
-def is_style_file(filename):
-    """Return True if the filename looks like a style file."""
-    return STYLE_FILE_PATTERN.match(filename) is not None
-
-
 def _apply_style(d, warn=True):
     mpl.rcParams.update(_remove_blacklisted_style_params(d, warn=warn))
 
@@ -182,17 +176,6 @@ def update_user_library(library):
     return library
 
 
-@cbook.deprecated("3.2")
-def iter_style_files(style_dir):
-    """Yield file path and name of styles in the given directory."""
-    for path in os.listdir(style_dir):
-        filename = os.path.basename(path)
-        if is_style_file(filename):
-            match = STYLE_FILE_PATTERN.match(filename)
-            path = os.path.abspath(os.path.join(style_dir, path))
-            yield path, match.group(1)
-
-
 def read_style_directory(style_dir):
     """Return dictionary of styles defined in *style_dir*."""
     styles = dict()
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -1773,19 +1773,6 @@ def to_values(self):
         mtx = self.get_matrix()
         return tuple(mtx[:2].swapaxes(0, 1).flat)
 
-    @staticmethod
-    @cbook.deprecated(
-        "3.2", alternative="Affine2D.from_values(...).get_matrix()")
-    def matrix_from_values(a, b, c, d, e, f):
-        """
-        Create a new transformation matrix as a 3x3 numpy array of the form::
-
-          a c e
-          b d f
-          0 0 1
-        """
-        return np.array([[a, c, e], [b, d, f], [0.0, 0.0, 1.0]], float)
-
     def transform_affine(self, points):
         mtx = self.get_matrix()
         if isinstance(points, np.ma.MaskedArray):
