matplotlib
diff --git a/‎doc/api/next_api_changes/removals/21661-TAC.rst
Lines changed: 12 additions & 0 deletions b/‎doc/api/next_api_changes/removals/21661-TAC.rst
Lines changed: 12 additions & 0 deletions
diff --git a/‎lib/matplotlib/sphinxext/plot_directive.py
Lines changed: 1 addition & 47 deletions b/‎lib/matplotlib/sphinxext/plot_directive.py
Lines changed: 1 addition & 47 deletions
diff --git a/‎lib/matplotlib/tests/tinypages/some_plots.rst
Lines changed: 0 additions & 1 deletion b/‎lib/matplotlib/tests/tinypages/some_plots.rst
Lines changed: 0 additions & 1 deletion
@@ -0,0 +1,12 @@
+plot directive removals
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The public methods:
+
+- ``matplotlib.sphinxext.split_code_at_show``
+- ``matplotlib.sphinxext.unescape_doctest``
+- ``matplotlib.sphinxext.run_code``
+
+have been removed.
+
+The deprecating *encoding* option to the plot directive has been removed.
@@ -60,11 +60,6 @@
         changed using the ``plot_html_show_source_link`` variable in
         :file:`conf.py` (which itself defaults to True).
 
-    ``:encoding:`` : str
-        If this source file is in a non-UTF8 or non-ASCII encoding, the
-        encoding must be specified using the ``:encoding:`` option.  The
-        encoding will not be inferred using the ``-*- coding -*-`` metacomment.
-
     ``:context:`` : bool or str
         If provided, the code will be run in the context of all previous plot
         directives for which the ``:context:`` option was specified.  This only
@@ -166,7 +161,7 @@
 import matplotlib
 from matplotlib.backend_bases import FigureManagerBase
 import matplotlib.pyplot as plt
-from matplotlib import _api, _pylab_helpers, cbook
+from matplotlib import _pylab_helpers, cbook
 
 matplotlib.use("agg")
 
@@ -200,11 +195,6 @@ def _option_format(arg):
     return directives.choice(arg, ('python', 'doctest'))
 
 
-def _deprecated_option_encoding(arg):
-    _api.warn_deprecated("3.5", name="encoding", obj_type="option")
-    return directives.encoding(arg)
-
-
 def mark_plot_labels(app, document):
     """
     To make plots referenceable, we need to move the reference from the
@@ -254,7 +244,6 @@ class PlotDirective(Directive):
         'format': _option_format,
         'context': _option_context,
         'nofigs': directives.flag,
-        'encoding': _deprecated_option_encoding,
         'caption': directives.unchanged,
         }
 
@@ -316,32 +305,6 @@ def contains_doctest(text):
     return bool(m)
 
 
-@_api.deprecated("3.5", alternative="doctest.script_from_examples")
-def unescape_doctest(text):
-    """
-    Extract code from a piece of text, which contains either Python code
-    or doctests.
-    """
-    if not contains_doctest(text):
-        return text
-    code = ""
-    for line in text.split("\n"):
-        m = re.match(r'^\s*(>>>|\.\.\.) (.*)$', line)
-        if m:
-            code += m.group(2) + "\n"
-        elif line.strip():
-            code += "# " + line.strip() + "\n"
-        else:
-            code += "\n"
-    return code
-
-
-@_api.deprecated("3.5")
-def split_code_at_show(text):
-    """Split code at plt.show()."""
-    return _split_code_at_show(text)[1]
-
-
 def _split_code_at_show(text, function_name):
     """Split code at plt.show()."""
 
@@ -473,15 +436,6 @@ class PlotError(RuntimeError):
     pass
 
 
-@_api.deprecated("3.5")
-def run_code(code, code_path, ns=None, function_name=None):
-    """
-    Import a Python module from a path, and run the function given by
-    name, if function_name is not None.
-    """
-    _run_code(unescape_doctest(code), code_path, ns, function_name)
-
-
 def _run_code(code, code_path, ns=None, function_name=None):
     """
     Import a Python module from a path, and run the function given by
 
@@ -124,7 +124,6 @@ Plot 15 uses an external file with the plot commands and a caption (the
 encoding is ignored and just verifies the deprecation is not broken):
 
 .. plot:: range4.py
-   :encoding: utf-8
 
    This is the caption for plot 15.