Fix Gcf.show_all()

OceanWolf · OceanWolf · commit 208c3be13338 · 2016-08-04T02:03:34.000+02:00
diff --git a/lib/matplotlib/_pylab_helpers.py b/lib/matplotlib/_pylab_helpers.py
@@ -76,18 +76,21 @@ def show_all(cls, block=None):
         for manager in managers:
             manager.show()
 
-        if block is not None:
-            if block:
-                manager._mainloop()
+        if block is True:
+            manager._mainloop()
+            return
+        elif block is False:
             return
 
+        # Hack: determine at runtime whether we are
+        # inside ipython in pylab mode.
         from matplotlib import pyplot
         try:
             ipython_pylab = not pyplot.show._needmain
             # IPython versions >= 0.10 tack the _needmain
             # attribute onto pyplot.show, and always set
             # it to False, when in %pylab mode.
-            ipython_pylab = ipython_pylab and get_backend() != 'WebAgg'
+            ipython_pylab = ipython_pylab and manager.backend_name != 'webagg'
             # TODO: The above is a hack to get the WebAgg backend
             # working with ipython's `%pylab` mode until proper
             # integration is implemented.
@@ -97,9 +100,9 @@ def show_all(cls, block=None):
         # Leave the following as a separate step in case we
         # want to control this behavior with an rcParam.
         if ipython_pylab:
-            block = False
+            return
 
-        if not is_interactive() or get_backend() == 'WebAgg':
+        if not is_interactive() or manager.backend_name == 'webagg':
             manager._mainloop()
 
     @classmethod
diff --git a/lib/matplotlib/backend_managers.py b/lib/matplotlib/backend_managers.py
@@ -21,7 +21,7 @@
 from matplotlib import is_interactive
 from matplotlib import rcParams
 from matplotlib.figure import Figure
-from matplotlib.backends import get_backend
+from matplotlib.backends import get_backend, backend as backend_name
 
 
 class FigureManagerEvent(object):
@@ -75,7 +75,7 @@ class FigureManager(cbook.EventEmitter):
     """
     def __init__(self, figure, num, **kwargs):
         super(FigureManager, self).__init__(**kwargs)
-        self._backend = get_backend()
+        self._backend_name, self._backend = get_backend()
 
         self.num = num
         self.figure = figure
@@ -193,6 +193,10 @@ def set_window_title(self, title):
     def backend(self):
         return self._backend
 
+    @property
+    def backend_name(self):
+        return self._backend_name
+
     def _get_toolbar(self):
         try:
             # must be inited after the window, drawingArea and figure
diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py
@@ -36,7 +36,7 @@ def get_backend(name=None):
     # the last argument is specifies whether to use absolute or relative
     # imports. 0 means only perform absolute imports.
     backend_name = get_backend_name(name)
-    return __import__(backend_name, globals(), locals(),
+    return backend_name, __import__(backend_name, globals(), locals(),
                        [backend_name], 0)
 
 
@@ -68,7 +68,7 @@ def pylab_setup(name=None):
 
     '''
     # Import the requested backend into a generic module object
-    backend_mod = get_backend(name)
+    backend_mod = get_backend(name)[1]
 
     # Things we pull in from all backends
     new_figure_manager = getattr(backend_mod, 'new_figure_manager', None)
