Convert block=None to block=True

dstansby · dstansby · commit b8806d53f157 · 2018-05-05T10:38:45.000+01:00
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -177,7 +177,7 @@ def draw_if_interactive(cls):
                 cls.trigger_manager_draw(manager)
 
     @classmethod
-    def show(cls, block=None):
+    def show(cls, block=True):
         """Show all figures.
 
         `show` blocks by calling `mainloop` if *block* is ``True``, or if it
@@ -198,7 +198,7 @@ def show(cls, block=None):
                 return
         if cls.mainloop is None:
             return
-        if block is None:
+        if block:
             # Hack: Are we in IPython's pylab mode?
             from matplotlib import pyplot
             try:
@@ -210,8 +210,6 @@ def show(cls, block=None):
             block = not ipython_pylab and not is_interactive()
             # TODO: The above is a hack to get the WebAgg backend working with
             # ipython's `%pylab` mode until proper integration is implemented.
-            if get_backend() == "WebAgg":
-                block = True
         if block:
             cls.mainloop()
 
@@ -244,7 +242,7 @@ class ShowBase(_Backend):
     Subclass must override mainloop() method.
     """
 
-    def __call__(self, block=None):
+    def __call__(self, block=True):
         return self.show(block=block)
 
 
@@ -2635,7 +2633,7 @@ def notify_axes_change(fig):
             if self.toolmanager is None and self.toolbar is not None:
                 self.toolbar.update()
 
-    def show(self):
+    def show(self, block=True):
         """
         For GUI backends, show the figure window and redraw.
         For non-GUI backends, raise an exception to be caught
diff --git a/lib/matplotlib/backends/backend_nbagg.py b/lib/matplotlib/backends/backend_nbagg.py
@@ -242,7 +242,7 @@ def trigger_manager_draw(manager):
         manager.show()
 
     @staticmethod
-    def show(*args, **kwargs):
+    def show(block=True):
         ## TODO: something to do when keyword block==False ?
         from matplotlib._pylab_helpers import Gcf
 
diff --git a/lib/matplotlib/backends/backend_template.py b/lib/matplotlib/backends/backend_template.py
@@ -172,7 +172,7 @@ def draw_if_interactive():
     """
 
 
-def show(block=None):
+def show(block=True):
     """
     For image backends - is not required
     For GUI backends - show() is usually the last line of a pylab script and
diff --git a/lib/matplotlib/backends/backend_webagg.py b/lib/matplotlib/backends/backend_webagg.py
@@ -319,7 +319,10 @@ def trigger_manager_draw(manager):
         manager.canvas.draw_idle()
 
     @staticmethod
-    def show():
+    def show(block=True):
+        if not block:
+            warnings.warn('The webagg backend does not support "block=False"')
+            block = True
         WebAggApplication.initialize()
 
         url = "http://127.0.0.1:{port}{prefix}".format(
