Cleanup

OceanWolf · tacaswell · commit 653514850507 · 2017-06-19T00:34:01.000-04:00
diff --git a/lib/matplotlib/backend_managers.py b/lib/matplotlib/backend_managers.py
@@ -89,12 +89,11 @@ def __init__(self, figure, num):
         self.toolmanager = ToolManager(self.canvas.figure)
         self.toolbar = self._get_toolbar()
 
-        if self.toolmanager:
-            tools.add_tools_to_manager(self.toolmanager)
-            if self.toolbar:
-                tools.add_tools_to_container(self.toolbar)
-                self.statusbar = self._backend.Statusbar(self.toolmanager)
-                h += self.window.add_element(self.statusbar, False, 'south')
+        tools.add_tools_to_manager(self.toolmanager)
+        if self.toolbar:
+            tools.add_tools_to_container(self.toolbar)
+            self.statusbar = self._backend.Statusbar(self.toolmanager)
+            h += self.window.add_element(self.statusbar, False, 'south')
 
         if self.toolbar is not None:
             h += self.window.add_element(self.toolbar, False, 'south')
diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py
@@ -36,8 +36,11 @@ def get_backend_name(name=None):
     return backend_name
 
 
-def get_backend():
-    backend_name = get_backend_name()
+def get_backend(name=None):
+    # Import the requested backend into a generic module object
+    # 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(),
                        [backend_name], 0)
 
@@ -70,18 +73,23 @@ def pylab_setup(name=None):
 
     '''
     # Import the requested backend into a generic module object
-    backend_name = get_backend_name(name)
-    # the last argument is specifies whether to use absolute or relative
-    # imports. 0 means only perform absolute imports.
-    backend_mod = __import__(backend_name, globals(), locals(),
-                             [backend_name], 0)
+    backend_mod = get_backend(name)
 
     # Things we pull in from all backends
     new_figure_manager = backend_mod.new_figure_manager
 
     # image backends like pdf, agg or svg do not need to do anything
     # for "show" or "draw_if_interactive", so if they are not defined
     # by the backend, just do nothing
+    def do_nothing_show(*args, **kwargs):
+        frame = inspect.currentframe()
+        fname = frame.f_back.f_code.co_filename
+        if fname in ('<stdin>', '<ipython console>'):
+            warnings.warn("""
+Your currently selected backend, '%s' does not support show().
+Please select a GUI backend in your matplotlibrc file ('%s')
+or with matplotlib.use()""" %
+                          (backend, matplotlib.matplotlib_fname()))
 
     def do_nothing(*args, **kwargs):
         pass
@@ -101,13 +109,3 @@ def do_nothing(*args, **kwargs):
     global backend
     backend = name
     return backend_mod, new_figure_manager, draw_if_interactive, show
-
-def do_nothing_show(*args, **kwargs):
-    frame = inspect.currentframe()
-    fname = frame.f_back.f_code.co_filename
-    if fname in ('<stdin>', '<ipython console>'):
-        warnings.warn("""
-Your currently selected backend, '%s' does not support show().
-Please select a GUI backend in your matplotlibrc file ('%s')
-or with matplotlib.use()""" %
-                          (name, matplotlib.matplotlib_fname()))
