matplotlib
diff --git a/‎lib/matplotlib/rcsetup.py
Copy file name to clipboardExpand all lines: lib/matplotlib/rcsetup.py
+18-3Lines changed: 18 additions & 3 deletions b/‎lib/matplotlib/rcsetup.py
Copy file name to clipboardExpand all lines: lib/matplotlib/rcsetup.py
+18-3Lines changed: 18 additions & 3 deletions
diff --git a/‎lib/matplotlib/tests/test_backend_qt4.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_backend_qt4.py
+2-4Lines changed: 2 additions & 4 deletions b/‎lib/matplotlib/tests/test_backend_qt4.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_backend_qt4.py
+2-4Lines changed: 2 additions & 4 deletions
diff --git a/‎lib/matplotlib/tests/test_backend_qt5.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_backend_qt5.py
+4-3Lines changed: 4 additions & 3 deletions b/‎lib/matplotlib/tests/test_backend_qt5.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_backend_qt5.py
+4-3Lines changed: 4 additions & 3 deletions
@@ -261,13 +261,28 @@ def validate_backend(s):
         lambda s:
         s if s.startswith("module://")
         else ValidateInStrings('backend', all_backends, ignorecase=True)(s))(s)
+    pyplot = sys.modules.get("matplotlib.pyplot")
     if len(candidates) == 1:
-        return candidates[0]
+        backend, = candidates
+        if pyplot:
+            # This import needs to be delayed (below too) because it is not
+            # available at first import.
+            from matplotlib import rcParams
+            # Don't recurse.
+            old_backend = rcParams["backend"]
+            if old_backend == backend:
+                return backend
+            dict.__setitem__(rcParams, "backend", backend)
+            try:
+                pyplot.switch_backend(backend)
+            except Exception:
+                dict.__setitem__(rcParams, "backend", old_backend)
+                raise
+        return backend
     else:
-        pyplot = sys.modules.get("matplotlib.pyplot")
         if pyplot:
-            pyplot.switch_backend(candidates)  # Actually resolves the backend.
             from matplotlib import rcParams
+            pyplot.switch_backend(candidates)  # Actually resolves the backend.
             return rcParams["backend"]
         else:
             return candidates
 
@@ -12,10 +12,8 @@
 except ImportError:
     import mock
 
-with matplotlib.rc_context(rc={'backend': 'Qt4Agg'}):
-    qt_compat = pytest.importorskip('matplotlib.backends.qt_compat')
-from matplotlib.backends.backend_qt4 import (
-    MODIFIER_KEYS, SUPER, ALT, CTRL, SHIFT)  # noqa
+pytest.importorskip('PyQt4')
+qt_compat = pytest.importorskip('matplotlib.backends.qt_compat')
 
 QtCore = qt_compat.QtCore
 _, ControlModifier, ControlKey = MODIFIER_KEYS[CTRL]
 
@@ -15,9 +15,10 @@
 except ImportError:
     import mock
 
-with matplotlib.rc_context(rc={'backend': 'Qt5Agg'}):
-    qt_compat = pytest.importorskip('matplotlib.backends.qt_compat',
-                                    minversion='5')
+pytest.importorskip('PyQt5')
+qt_compat = pytest.importorskip('matplotlib.backends.qt_compat',
+                                minversion='5')
+
 from matplotlib.backends.backend_qt5 import (
     MODIFIER_KEYS, SUPER, ALT, CTRL, SHIFT)  # noqa