Remove deprecated mathtext classes.

QuLogic · QuLogic · commit 3c9b03163dc6 · 2021-04-08T00:34:38.000-04:00
diff --git a/doc/api/next_api_changes/removals/19900-ES.rst b/doc/api/next_api_changes/removals/19900-ES.rst
@@ -1,3 +1,13 @@
+mathtext ``Glue`` classes
+~~~~~~~~~~~~~~~~~~~~~~~~~
+The following have been removed from `matplotlib.mathtext`:
+
+* *copy* parameter of ``mathtext.Glue``
+* ``mathtext.Glue.glue_subtype``
+* ``mathtext.GlueSpec``
+* ``Fil``, ``Fill``, ``Filll``, ``NegFil``, ``NegFill``, ``NegFilll``, and
+  ``SsGlue``; directly construct glue instances with ``Glue("fil")``, etc.
+
 *ismath* parameter of ``draw_tex``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The *ismath* parameter of the ``draw_tex`` method of all renderer classes has
diff --git a/lib/matplotlib/_mathtext.py b/lib/matplotlib/_mathtext.py
@@ -1546,10 +1546,7 @@ class Glue(Node):
     it's easier to stick to what TeX does.)
     """
 
-    glue_subtype = _api.deprecated("3.3")(property(lambda self: "normal"))
-
-    @_api.delete_parameter("3.3", "copy")
-    def __init__(self, glue_type, copy=False):
+    def __init__(self, glue_type):
         super().__init__()
         if isinstance(glue_type, str):
             glue_spec = _GlueSpec._named[glue_type]
@@ -1571,51 +1568,6 @@ def grow(self):
         self.glue_spec = g._replace(width=g.width * GROW_FACTOR)
 
 
-# Some convenient ways to get common kinds of glue
-
-
-@_api.deprecated("3.3", alternative="Glue('fil')")
-class Fil(Glue):
-    def __init__(self):
-        super().__init__('fil')
-
-
-@_api.deprecated("3.3", alternative="Glue('fill')")
-class Fill(Glue):
-    def __init__(self):
-        super().__init__('fill')
-
-
-@_api.deprecated("3.3", alternative="Glue('filll')")
-class Filll(Glue):
-    def __init__(self):
-        super().__init__('filll')
-
-
-@_api.deprecated("3.3", alternative="Glue('neg_fil')")
-class NegFil(Glue):
-    def __init__(self):
-        super().__init__('neg_fil')
-
-
-@_api.deprecated("3.3", alternative="Glue('neg_fill')")
-class NegFill(Glue):
-    def __init__(self):
-        super().__init__('neg_fill')
-
-
-@_api.deprecated("3.3", alternative="Glue('neg_filll')")
-class NegFilll(Glue):
-    def __init__(self):
-        super().__init__('neg_filll')
-
-
-@_api.deprecated("3.3", alternative="Glue('ss')")
-class SsGlue(Glue):
-    def __init__(self):
-        super().__init__('ss')
-
-
 class HCentered(Hlist):
     """
     A convenience class to create an `Hlist` whose contents are
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -359,36 +359,6 @@ class MathTextWarning(Warning):
     pass
 
 
-@_api.deprecated("3.3")
-class GlueSpec:
-    """See `Glue`."""
-
-    def __init__(self, width=0., stretch=0., stretch_order=0,
-                 shrink=0., shrink_order=0):
-        self.width         = width
-        self.stretch       = stretch
-        self.stretch_order = stretch_order
-        self.shrink        = shrink
-        self.shrink_order  = shrink_order
-
-    def copy(self):
-        return GlueSpec(
-            self.width,
-            self.stretch,
-            self.stretch_order,
-            self.shrink,
-            self.shrink_order)
-
-    @classmethod
-    def factory(cls, glue_type):
-        return cls._types[glue_type]
-
-
-with _api.suppress_matplotlib_deprecation_warning():
-    GlueSpec._types = {k: GlueSpec(**v._asdict())
-                       for k, v in _mathtext._GlueSpec._named.items()}
-
-
 @_api.deprecated("3.4")
 def ship(ox, oy, box):
     _mathtext.ship(ox, oy, box)
