matplotlib
diff --git a/‎lib/matplotlib/backend_bases.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backend_bases.py
+3-3Lines changed: 3 additions & 3 deletions b/‎lib/matplotlib/backend_bases.py
Copy file name to clipboardExpand all lines: lib/matplotlib/backend_bases.py
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎lib/matplotlib/pyplot.py
Copy file name to clipboardExpand all lines: lib/matplotlib/pyplot.py
+1-4Lines changed: 1 addition & 4 deletions b/‎lib/matplotlib/pyplot.py
Copy file name to clipboardExpand all lines: lib/matplotlib/pyplot.py
+1-4Lines changed: 1 addition & 4 deletions
diff --git a/‎lib/matplotlib/tests/test_backend_bases.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_backend_bases.py
+2-2Lines changed: 2 additions & 2 deletions b/‎lib/matplotlib/tests/test_backend_bases.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_backend_bases.py
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎lib/matplotlib/tests/test_backends_interactive.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_backends_interactive.py
+1Lines changed: 1 addition & 0 deletions b/‎lib/matplotlib/tests/test_backends_interactive.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_backends_interactive.py
+1Lines changed: 1 addition & 0 deletions
@@ -45,7 +45,7 @@
 import matplotlib as mpl
 from matplotlib import (
     _api, backend_tools as tools, cbook, colors, _docstring, text,
-    _tight_bbox, transforms, widgets, get_backend, is_interactive, rcParams)
+    _tight_bbox, transforms, widgets, is_interactive, rcParams)
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_managers import ToolManager
 from matplotlib.cbook import _setattr_cm
@@ -2734,8 +2734,8 @@ def show(self):
             # thus warrants a warning.
             return
         raise NonGuiException(
-            f"Matplotlib is currently using {get_backend()}, which is a "
-            f"non-GUI backend, so cannot show the figure.")
+            f"{type(self.canvas).__name__} is non-interactive, and thus cannot be "
+            f"shown")
 
     def destroy(self):
         pass
 
@@ -391,11 +391,8 @@ def draw_if_interactive():
     # Need to keep a global reference to the backend for compatibility reasons.
     # See https://github.com/matplotlib/matplotlib/issues/6092
     matplotlib.backends.backend = newbackend
-    if not cbook._str_equal(old_backend, newbackend):
-        close("all")
 
-    # make sure the repl display hook is installed in case we become
-    # interactive
+    # Make sure the repl display hook is installed in case we become interactive.
     install_repl_displayhook()
 
 
 
@@ -85,13 +85,13 @@ def test_non_gui_warning(monkeypatch):
     with pytest.warns(UserWarning) as rec:
         plt.show()
         assert len(rec) == 1
-        assert ('Matplotlib is currently using pdf, which is a non-GUI backend'
+        assert ('FigureCanvasPdf is non-interactive, and thus cannot be shown'
                 in str(rec[0].message))
 
     with pytest.warns(UserWarning) as rec:
         plt.gcf().show()
         assert len(rec) == 1
-        assert ('Matplotlib is currently using pdf, which is a non-GUI backend'
+        assert ('FigureCanvasPdf is non-interactive, and thus cannot be shown'
                 in str(rec[0].message))
 
 
 
@@ -145,6 +145,7 @@ def check_alt_backend(alt_backend):
             fig = plt.figure()
             assert (type(fig.canvas).__module__ ==
                     f"matplotlib.backends.backend_{alt_backend}")
+            plt.close("all")
 
         if importlib.util.find_spec("cairocffi"):
             check_alt_backend(backend[:-3] + "cairo")