Merge pull request #15341 from anntzer/nonguiexception

dstansby · web-flow · commit 6870ac000975 · 2019-09-27T12:42:31.000+01:00
Move non-gui warning message to backend_bases.
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -2563,11 +2563,15 @@ def notify_axes_change(fig):
     def show(self):
         """
         For GUI backends, show the figure window and redraw.
-        For non-GUI backends, raise an exception to be caught
-        by :meth:`~matplotlib.figure.Figure.show`, for an
-        optional warning.
+        For non-GUI backends, raise an exception, unless running headless (i.e.
+        on Linux with an unset DISPLAY); this exception is converted to a
+        warning in `.Figure.show`.
         """
-        raise NonGuiException()
+        # This should be overridden in GUI backends.
+        if mpl.backends._get_running_interactive_framework() != "headless":
+            raise NonGuiException(
+                f"Matplotlib is currently using {get_backend()}, which is "
+                f"a non-GUI backend, so cannot show the figure.")
 
     def destroy(self):
         pass
@@ -3360,8 +3364,10 @@ def show(cls, block=None):
         if not managers:
             return
         for manager in managers:
-            # Emits a warning if the backend is non-interactive.
-            manager.canvas.figure.show()
+            try:
+                manager.show()  # Emits a warning for non-interactive backend.
+            except NonGuiException as exc:
+                cbook._warn_external(str(exc))
         if cls.mainloop is None:
             return
         if block is None:
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -436,12 +436,8 @@ def show(self, warn=True):
                 "normally created by pyplot.figure()")
         try:
             self.canvas.manager.show()
-        except NonGuiException:
-            if (backends._get_running_interactive_framework() != "headless"
-                    and warn):
-                cbook._warn_external(
-                    f"Matplotlib is currently using {get_backend()}, which is "
-                    f"a non-GUI backend, so cannot show the figure.")
+        except NonGuiException as exc:
+            cbook._warn_external(str(exc))
 
     def _get_axes(self):
         return self._axstack.as_list()
