Merge pull request #14540 from anntzer/sphinxswitchbackend

timhoffm · web-flow · commit 512aecb3ba33 · 2019-06-13T17:40:29.000+02:00
Simplify backend switching in plot_directive.
diff --git a/lib/matplotlib/sphinxext/plot_directive.py b/lib/matplotlib/sphinxext/plot_directive.py
@@ -141,24 +141,17 @@
 import sys
 import textwrap
 import traceback
-import warnings
 
 from docutils.parsers.rst import directives, Directive
 from docutils.parsers.rst.directives.images import Image
 import jinja2  # Sphinx dependency.
 
 import matplotlib
 from matplotlib.backend_bases import FigureManagerBase
-try:
-    with warnings.catch_warnings(record=True):
-        warnings.simplefilter("error", UserWarning)
-        matplotlib.use('Agg')
-except UserWarning:
-    import matplotlib.pyplot as plt
-    plt.switch_backend("Agg")
-else:
-    import matplotlib.pyplot as plt
+import matplotlib.pyplot as plt
 from matplotlib import _pylab_helpers, cbook
+
+matplotlib.use("agg")
 align = Image.align
 
 __version__ = 2
