Remove privatized or unused helper functions

Author: oscargus

lib/matplotlib/backends/backend_pdf.py

@@ -92,11 +92,6 @@
 # * draw_quad_mesh
 
 
-@_api.deprecated("3.6", alternative="a vendored copy of _fill")
-def fill(strings, linelen=75):
-    return _fill(strings, linelen=linelen)
-
-
 def _fill(strings, linelen=75):
     """
     Make one string from sequence of strings, with whitespace in between.
@@ -442,29 +437,10 @@ def __lt__(self, other):
     def __hash__(self):
         return hash(self.name)
 
-    @staticmethod
-    @_api.deprecated("3.6")
-    def hexify(match):
-        return '#%02x' % ord(match.group())
-
     def pdfRepr(self):
         return b'/' + self.name
 
 
-@_api.deprecated("3.6")
-class Operator:
-    __slots__ = ('op',)
-
-    def __init__(self, op):
-        self.op = op
-
-    def __repr__(self):
-        return '<Operator %s>' % self.op
-
-    def pdfRepr(self):
-        return self.op
-
-
 class Verbatim:
     """Store verbatim PDF command content for later inclusion in the stream."""
     def __init__(self, x):
@@ -515,8 +491,6 @@ class Op(Enum):
     clip = b'W'
     shading = b'sh'
 
-    op = _api.deprecated('3.6')(property(lambda self: self.value))
-
     def pdfRepr(self):
         return self.value
 

lib/matplotlib/backends/backend_pgf.py

@@ -14,7 +14,7 @@
 from PIL import Image
 
 import matplotlib as mpl
-from matplotlib import _api, cbook, font_manager as fm
+from matplotlib import cbook, font_manager as fm
 from matplotlib.backend_bases import (
     _Backend, FigureCanvasBase, FigureManagerBase, RendererBase
 )
@@ -32,28 +32,6 @@
 # %f/{:f} format rather than %s/{} to avoid triggering scientific notation,
 # which is not recognized by TeX.
 
-
-@_api.caching_module_getattr
-class __getattr__:
-    NO_ESCAPE = _api.deprecated("3.6", obj_type="")(
-        property(lambda self: r"(?<!\\)(?:\\\\)*"))
-    re_mathsep = _api.deprecated("3.6", obj_type="")(
-        property(lambda self: r"(?<!\\)(?:\\\\)*\$"))
-
-
-@_api.deprecated("3.6")
-def get_fontspec():
-    """Build fontspec preamble from rc."""
-    with mpl.rc_context({"pgf.preamble": ""}):
-        return _get_preamble()
-
-
-@_api.deprecated("3.6")
-def get_preamble():
-    """Get LaTeX preamble from rc."""
-    return mpl.rcParams["pgf.preamble"]
-
-
 def _get_preamble():
     """Prepare a LaTeX preamble based on the rcParams configuration."""
     preamble = [
@@ -89,11 +67,6 @@ def _get_preamble():
 mpl_in_to_pt = 1. / mpl_pt_to_in
 
 
-@_api.deprecated("3.6")
-def common_texification(text):
-    return _tex_escape(text)
-
-
 def _tex_escape(text):
     r"""
     Do some necessary and/or useful substitutions for texts to be included in
@@ -102,11 +75,6 @@ def _tex_escape(text):
     return text.replace("\N{MINUS SIGN}", r"\ensuremath{-}")
 
 
-@_api.deprecated("3.6")
-def writeln(fh, line):
-    return _writeln(fh, line)
-
-
 def _writeln(fh, line):
     # Ending lines with a % prevents TeX from inserting spurious spaces
     # (https://tex.stackexchange.com/questions/7453).
@@ -295,11 +263,6 @@ def __init__(self):
         # Per-instance cache.
         self._get_box_metrics = functools.lru_cache(self._get_box_metrics)
 
-    texcommand = _api.deprecated("3.6")(
-        property(lambda self: mpl.rcParams["pgf.texsystem"]))
-    latex_header = _api.deprecated("3.6")(
-        property(lambda self: self._build_latex_header()))
-
     def _setup_latex_process(self, *, expect_reply=True):
         # Open LaTeX process for real work; register it for deletion.  On
         # Windows, we must ensure that the subprocess has quit before being

lib/matplotlib/backends/backend_ps.py

@@ -11,7 +11,6 @@
 import logging
 import os
 import pathlib
-import re
 import shutil
 from tempfile import TemporaryDirectory
 import time
@@ -92,20 +91,6 @@ def _nums_to_str(*args):
     return " ".join(f"{arg:1.3f}".rstrip("0").rstrip(".") for arg in args)
 
 
-@_api.deprecated("3.6", alternative="a vendored copy of this function")
-def quote_ps_string(s):
-    """
-    Quote dangerous characters of S for use in a PostScript string constant.
-    """
-    s = s.replace(b"\\", b"\\\\")
-    s = s.replace(b"(", b"\\(")
-    s = s.replace(b")", b"\\)")
-    s = s.replace(b"'", b"\\251")
-    s = s.replace(b"`", b"\\301")
-    s = re.sub(br"[^ -~\n]", lambda x: br"\%03o" % ord(x.group()), s)
-    return s.decode('ascii')
-
-
 def _move_path_to_path_or_stream(src, dst):
     """
     Move the contents of file at *src* to path-or-filelike *dst*.
@@ -1096,13 +1081,6 @@ def draw(self):
         return super().draw()
 
 
-@_api.deprecated("3.6")
-def convert_psfrags(tmpfile, psfrags, font_preamble, custom_preamble,
-                    paper_width, paper_height, orientation):
-    return _convert_psfrags(
-        pathlib.Path(tmpfile), psfrags, paper_width, paper_height, orientation)
-
-
 def _convert_psfrags(tmppath, psfrags, paper_width, paper_height, orientation):
     """
     When we want to use the LaTeX backend with postscript, we write PSFrag tags

lib/matplotlib/backends/backend_svg.py

@@ -14,7 +14,7 @@
 from PIL import Image
 
 import matplotlib as mpl
-from matplotlib import _api, cbook, font_manager as fm
+from matplotlib import cbook, font_manager as fm
 from matplotlib.backend_bases import (
      _Backend, FigureCanvasBase, FigureManagerBase, RendererBase)
 from matplotlib.backends.backend_mixed import MixedModeRenderer
@@ -66,11 +66,6 @@
 # --------------------------------------------------------------------
 
 
-@_api.deprecated("3.6", alternative="a vendored copy of _escape_cdata")
-def escape_cdata(s):
-    return _escape_cdata(s)
-
-
 def _escape_cdata(s):
     s = s.replace("&", "&")
     s = s.replace("<", "&lt;")
@@ -81,21 +76,11 @@ def _escape_cdata(s):
 _escape_xml_comment = re.compile(r'-(?=-)')
 
 
-@_api.deprecated("3.6", alternative="a vendored copy of _escape_comment")
-def escape_comment(s):
-    return _escape_comment.sub(s)
-
-
 def _escape_comment(s):
     s = _escape_cdata(s)
     return _escape_xml_comment.sub('- ', s)
 
 
-@_api.deprecated("3.6", alternative="a vendored copy of _escape_attrib")
-def escape_attrib(s):
-    return _escape_attrib(s)
-
-
 def _escape_attrib(s):
     s = s.replace("&", "&amp;")
     s = s.replace("'", "&apos;")
@@ -111,11 +96,6 @@ def _quote_escape_attrib(s):
             '"' + _escape_attrib(s) + '"')
 
 
-@_api.deprecated("3.6", alternative="a vendored copy of _short_float_fmt")
-def short_float_fmt(x):
-    return _short_float_fmt(x)
-
-
 def _short_float_fmt(x):
     """
     Create a short string representation of a float, which is %f
@@ -281,20 +261,10 @@ def _generate_transform(transform_list):
     return ' '.join(parts)
 
 
-@_api.deprecated("3.6")
-def generate_transform(transform_list=None):
-    return _generate_transform(transform_list or [])
-
-
 def _generate_css(attrib):
     return "; ".join(f"{k}: {v}" for k, v in attrib.items())
 
 
-@_api.deprecated("3.6")
-def generate_css(attrib=None):
-    return _generate_css(attrib or {})
-
-
 _capstyle_d = {'projecting': 'square', 'butt': 'butt', 'round': 'round'}