Expire deprecations

Author: oscargus

lib/matplotlib/_mathtext.py

@@ -20,7 +20,7 @@
     pyparsing_common)
 
 import matplotlib as mpl
-from . import _api, cbook
+from . import cbook
 from ._mathtext_data import (
     latex_to_bakoma, stix_glyph_fixes, stix_virtual_fonts, tex2uni)
 from .font_manager import FontProperties, findfont, get_font
@@ -35,8 +35,7 @@
 # FONTS
 
 
-@_api.delete_parameter("3.6", "math")
-def get_unicode_index(symbol, math=False):  # Publicly exported.
+def get_unicode_index(symbol):  # Publicly exported.
     r"""
     Return the integer index (from the Unicode table) of *symbol*.
 
@@ -45,17 +44,7 @@ def get_unicode_index(symbol, math=False):  # Publicly exported.
     symbol : str
         A single (Unicode) character, a TeX command (e.g. r'\pi') or a Type1
         symbol name (e.g. 'phi').
-    math : bool, default: False
-        If True (deprecated), replace ASCII hyphen-minus by Unicode minus.
     """
-    # From UTF #25: U+2212 minus sign is the preferred
-    # representation of the unary and binary minus sign rather than
-    # the ASCII-derived U+002D hyphen-minus, because minus sign is
-    # unambiguous and because it is rendered with a more desirable
-    # length, usually longer than a hyphen.
-    # Remove this block when the 'math' parameter is deleted.
-    if math and symbol == '-':
-        return 0x2212
     try:  # This will succeed if symbol is a single Unicode char
         return ord(symbol)
     except TypeError:

lib/matplotlib/axis.py

@@ -240,10 +240,6 @@ def set_clip_path(self, clippath, transform=None):
         self.gridline.set_clip_path(clippath, transform)
         self.stale = True
 
-    @_api.deprecated("3.6")
-    def get_pad_pixels(self):
-        return self.figure.dpi * self._base_pad / 72
-
     def contains(self, mouseevent):
         """
         Test whether the mouse event occurred in the Tick marks.
@@ -1250,21 +1246,6 @@ def _set_artist_props(self, a):
             return
         a.set_figure(self.figure)
 
-    @_api.deprecated("3.6")
-    def get_ticklabel_extents(self, renderer):
-        """Get the extents of the tick labels on either side of the axes."""
-        ticks_to_draw = self._update_ticks()
-        tlb1, tlb2 = self._get_ticklabel_bboxes(ticks_to_draw, renderer)
-        if len(tlb1):
-            bbox1 = mtransforms.Bbox.union(tlb1)
-        else:
-            bbox1 = mtransforms.Bbox.from_extents(0, 0, 0, 0)
-        if len(tlb2):
-            bbox2 = mtransforms.Bbox.union(tlb2)
-        else:
-            bbox2 = mtransforms.Bbox.from_extents(0, 0, 0, 0)
-        return bbox1, bbox2
-
     def _update_ticks(self):
         """
         Update ticks (position and labels) using the current data interval of
@@ -2350,29 +2331,6 @@ def _update_offset_text_position(self, bboxes, bboxes2):
             y = top + self.OFFSETTEXTPAD * self.figure.dpi / 72
         self.offsetText.set_position((x, y))
 
-    @_api.deprecated("3.6")
-    def get_text_heights(self, renderer):
-        """
-        Return how much space should be reserved for text above and below the
-        Axes, as a pair of floats.
-        """
-        bbox, bbox2 = self.get_ticklabel_extents(renderer)
-        # MGDTODO: Need a better way to get the pad
-        pad_pixels = self.majorTicks[0].get_pad_pixels()
-
-        above = 0.0
-        if bbox2.height:
-            above += bbox2.height + pad_pixels
-        below = 0.0
-        if bbox.height:
-            below += bbox.height + pad_pixels
-
-        if self.get_label_position() == 'top':
-            above += self.label.get_window_extent(renderer).height + pad_pixels
-        else:
-            below += self.label.get_window_extent(renderer).height + pad_pixels
-        return above, below
-
     def set_ticks_position(self, position):
         """
         Set the ticks position.
@@ -2621,25 +2579,6 @@ def set_offset_position(self, position):
         self.offsetText.set_position((x, y))
         self.stale = True
 
-    @_api.deprecated("3.6")
-    def get_text_widths(self, renderer):
-        bbox, bbox2 = self.get_ticklabel_extents(renderer)
-        # MGDTODO: Need a better way to get the pad
-        pad_pixels = self.majorTicks[0].get_pad_pixels()
-
-        left = 0.0
-        if bbox.width:
-            left += bbox.width + pad_pixels
-        right = 0.0
-        if bbox2.width:
-            right += bbox2.width + pad_pixels
-
-        if self.get_label_position() == 'left':
-            left += self.label.get_window_extent(renderer).width + pad_pixels
-        else:
-            right += self.label.get_window_extent(renderer).width + pad_pixels
-        return left, right
-
     def set_ticks_position(self, position):
         """
         Set the ticks position.

lib/matplotlib/mathtext.py

@@ -15,15 +15,11 @@
 metrics for those fonts.
 """
 
-from collections import namedtuple
 import functools
 import logging
 
-import numpy as np
-
-import matplotlib as mpl
 from matplotlib import _api, _mathtext
-from matplotlib.ft2font import FT2Image, LOAD_NO_HINTING
+from matplotlib.ft2font import LOAD_NO_HINTING
 from matplotlib.font_manager import FontProperties
 from ._mathtext import (  # noqa: reexported API
     RasterParse, VectorParse, get_unicode_index)
@@ -33,151 +29,6 @@
 
 get_unicode_index.__module__ = __name__
 
-
-@_api.deprecated("3.6")
-class MathtextBackend:
-    """
-    The base class for the mathtext backend-specific code.  `MathtextBackend`
-    subclasses interface between mathtext and specific Matplotlib graphics
-    backends.
-
-    Subclasses need to override the following:
-
-    - :meth:`render_glyph`
-    - :meth:`render_rect_filled`
-    - :meth:`get_results`
-
-    And optionally, if you need to use a FreeType hinting style:
-
-    - :meth:`get_hinting_type`
-    """
-    def __init__(self):
-        self.width = 0
-        self.height = 0
-        self.depth = 0
-
-    def set_canvas_size(self, w, h, d):
-        """Set the dimension of the drawing canvas."""
-        self.width  = w
-        self.height = h
-        self.depth  = d
-
-    def render_glyph(self, ox, oy, info):
-        """
-        Draw a glyph described by *info* to the reference point (*ox*,
-        *oy*).
-        """
-        raise NotImplementedError()
-
-    def render_rect_filled(self, x1, y1, x2, y2):
-        """
-        Draw a filled black rectangle from (*x1*, *y1*) to (*x2*, *y2*).
-        """
-        raise NotImplementedError()
-
-    def get_results(self, box):
-        """
-        Return a backend-specific tuple to return to the backend after
-        all processing is done.
-        """
-        raise NotImplementedError()
-
-    def get_hinting_type(self):
-        """
-        Get the FreeType hinting type to use with this particular
-        backend.
-        """
-        return LOAD_NO_HINTING
-
-
-@_api.deprecated("3.6")
-class MathtextBackendAgg(MathtextBackend):
-    """
-    Render glyphs and rectangles to an FTImage buffer, which is later
-    transferred to the Agg image by the Agg backend.
-    """
-    def __init__(self):
-        self.ox = 0
-        self.oy = 0
-        self.image = None
-        self.mode = 'bbox'
-        self.bbox = [0, 0, 0, 0]
-        super().__init__()
-
-    def _update_bbox(self, x1, y1, x2, y2):
-        self.bbox = [min(self.bbox[0], x1),
-                     min(self.bbox[1], y1),
-                     max(self.bbox[2], x2),
-                     max(self.bbox[3], y2)]
-
-    def set_canvas_size(self, w, h, d):
-        super().set_canvas_size(w, h, d)
-        if self.mode != 'bbox':
-            self.image = FT2Image(np.ceil(w), np.ceil(h + max(d, 0)))
-
-    def render_glyph(self, ox, oy, info):
-        if self.mode == 'bbox':
-            self._update_bbox(ox + info.metrics.xmin,
-                              oy - info.metrics.ymax,
-                              ox + info.metrics.xmax,
-                              oy - info.metrics.ymin)
-        else:
-            info.font.draw_glyph_to_bitmap(
-                self.image, ox, oy - info.metrics.iceberg, info.glyph,
-                antialiased=mpl.rcParams['text.antialiased'])
-
-    def render_rect_filled(self, x1, y1, x2, y2):
-        if self.mode == 'bbox':
-            self._update_bbox(x1, y1, x2, y2)
-        else:
-            height = max(int(y2 - y1) - 1, 0)
-            if height == 0:
-                center = (y2 + y1) / 2.0
-                y = int(center - (height + 1) / 2.0)
-            else:
-                y = int(y1)
-            self.image.draw_rect_filled(int(x1), y, np.ceil(x2), y + height)
-
-    def get_results(self, box):
-        self.image = None
-        self.mode = 'render'
-        return _mathtext.ship(box).to_raster()
-
-    def get_hinting_type(self):
-        from matplotlib.backends import backend_agg
-        return backend_agg.get_hinting_flag()
-
-
-@_api.deprecated("3.6")
-class MathtextBackendPath(MathtextBackend):
-    """
-    Store information to write a mathtext rendering to the text path
-    machinery.
-    """
-
-    _Result = namedtuple("_Result", "width height depth glyphs rects")
-
-    def __init__(self):
-        super().__init__()
-        self.glyphs = []
-        self.rects = []
-
-    def render_glyph(self, ox, oy, info):
-        oy = self.height - oy + info.offset
-        self.glyphs.append((info.font, info.fontsize, info.num, ox, oy))
-
-    def render_rect_filled(self, x1, y1, x2, y2):
-        self.rects.append((x1, self.height - y2, x2 - x1, y2 - y1))
-
-    def get_results(self, box):
-        return _mathtext.ship(box).to_vector()
-
-
-@_api.deprecated("3.6")
-class MathTextWarning(Warning):
-    pass
-
-
 ##############################################################################
 # MAIN