Small refactor so that we first initiate the Navigation (ToolManager), before filling it with tools.

Added a nice utility API function, Navigation.addTools.

Author: OceanWolf

lib/matplotlib/backend_bases.py

@@ -3262,13 +3262,6 @@ def __init__(self, manager):
         # to write into toolbar message
         self.messagelock = widgets.LockDraw()
 
-        for name, tool in tools.tools:
-            if tool is None:
-                if self.toolbar is not None:
-                    self.toolbar.add_separator(-1)
-            else:
-                self.add_tool(name, tool, None)
-
         self._last_cursor = self._default_cursor
 
     @property
@@ -3371,6 +3364,22 @@ def remove_tool(self, name):
         if self.toolbar:
             self.toolbar._remove_toolitem(name)
 
+    def add_tools(self, tools):
+        """ Add multiple tools to `Navigation`
+
+        Parameters
+        ----------
+        tools : a list of tuples which contains the id of the tool and
+        a either a reference to the tool Tool class itself, or None to
+        insert a spacer.  See :func:`add_tool`.
+        """
+        for name, tool in tools:
+            if tool is None:
+                if self.toolbar is not None:
+                    self.toolbar.add_separator(-1)
+            else:
+                self.add_tool(name, tool, None)
+
     def add_tool(self, name, tool, position=None):
         """Add tool to `Navigation`
 

lib/matplotlib/pyplot.py

@@ -31,6 +31,7 @@
 from matplotlib.cbook import _string_to_bool
 from matplotlib import docstring
 from matplotlib.backend_bases import FigureCanvasBase
+from matplotlib.backend_tools import tools as default_tools
 from matplotlib.figure import Figure, figaspect
 from matplotlib.gridspec import GridSpec
 from matplotlib.image import imread as _imread
@@ -433,6 +434,9 @@ def figure(num=None,  # autoincrement if None, else integer from 1-N
                                         FigureClass=FigureClass,
                                         **kwargs)
 
+        if rcParams['toolbar'] == 'navigation':
+            figManager.navigation.add_tools(default_tools)
+
         if figLabel:
             figManager.set_window_title(figLabel)
             figManager.canvas.figure.set_label(figLabel)