Merge pull request #16262 from anntzer/rcbackend

tacaswell · web-flow · commit 15e8d38256a3 · 2020-01-19T17:52:22.000-05:00
MNT: Dedupe update of rcParams["backend"] in use() and in switch_backend()
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -971,7 +971,7 @@ def rcdefaults():
     --------
     rc_file_defaults
         Restore the rc params from the rc file originally loaded by Matplotlib.
-    matplotlib.style.use :
+    matplotlib.style.use
         Use a specific style file.  Call ``style.use('default')`` to restore
         the default style.
     """
@@ -1124,11 +1124,6 @@ def use(backend, *, force=True):
         # Nothing to do if the requested backend is already set
         pass
     else:
-        # Update both rcParams and rcDefaults so restoring the defaults later
-        # with rcdefaults won't change the backend.  This is a bit of overkill
-        # as 'backend' is already in style.core.STYLE_BLACKLIST, but better to
-        # be safe.
-        rcParams['backend'] = rcParamsDefault['backend'] = name
         try:
             from matplotlib import pyplot as plt
             plt.switch_backend(name)
diff --git a/lib/matplotlib/pyplot.py b/lib/matplotlib/pyplot.py
@@ -229,6 +229,9 @@ def switch_backend(newbackend):
                 "framework, as {!r} is currently running".format(
                     newbackend, required_framework, current_framework))
 
+    # Update both rcParams and rcDefaults so restoring the defaults later with
+    # rcdefaults won't change the backend.  A bit of overkill as 'backend' is
+    # already in style.core.STYLE_BLACKLIST, but better to be safe.
     rcParams['backend'] = rcParamsDefault['backend'] = newbackend
 
     global _backend_mod, new_figure_manager, draw_if_interactive, _show
