add_tools moved out of base classes

Author: fariza

lib/matplotlib/backend_bases.py

@@ -3406,20 +3406,6 @@ def remove_tool(self, name):
 
         del self._tools[name]
 
-    def add_tools(self, tools):
-        """
-        Add multiple tools to `NavigationBase`
-
-        Parameters
-        ----------
-        tools : {str: class_like}
-            The tools to add in a {name: tool} dict, see `add_tool` for more
-            info.
-        """
-
-        for name, tool in six.iteritems(tools):
-            self.add_tool(name, tool)
-
     def add_tool(self, name, tool, *args, **kwargs):
         """
         Add tool to `NavigationBase`
@@ -3515,9 +3501,9 @@ def _handle_toggle(self, tool, sender, canvasevent, data):
         else:
             # Untoggle previously toggled tool
             self.trigger_tool(self._toggled[radio_group],
-                                    self,
-                                    canvasevent,
-                                    data)
+                              self,
+                              canvasevent,
+                              data)
             toggled = tool.name
 
         # Keep track of the toggled tool in the radio_group
@@ -3645,23 +3631,6 @@ def _tool_toggled_cbk(self, event):
         """
         self.toggle_toolitem(event.tool.name, event.tool.toggled)
 
-    def add_tools(self, tools):
-        """
-        Add multiple tools to the container.
-
-        Parameters
-        ----------
-        tools : list
-            List in the form
-            [[group1, [tool1, tool2 ...]], [group2, [...]]]
-            Where the tools given by tool1, and tool2 will display in group1.
-            See `add_tool` for details.
-        """
-
-        for group, grouptools in tools:
-            for position, tool in enumerate(grouptools):
-                self.add_tool(tool, group, position)
-
     def add_tool(self, tool, group, position=-1):
         """
         Adds a tool to this container

lib/matplotlib/backend_tools.py

@@ -16,6 +16,7 @@
 import matplotlib.cbook as cbook
 from weakref import WeakKeyDictionary
 import numpy as np
+import six
 
 
 class Cursors(object):
@@ -946,3 +947,36 @@ def _mouse_move(self, event):
                  ['layout', ['subplots']],
                  ['io', ['save']]]
 """Default tools in the toolbar"""
+
+
+def add_tools_2_navigation(navigation, tools=tools):
+    """
+    Add multiple tools to `Navigation`
+
+    Parameters
+    ----------
+    tools : {str: class_like}
+        The tools to add in a {name: tool} dict, see `add_tool` for more
+        info.
+    """
+
+    for name, tool in six.iteritems(tools):
+        navigation.add_tool(name, tool)
+
+
+def add_tools_2_container(container, tools=toolbar_tools):
+    """
+    Add multiple tools to the container.
+
+    Parameters
+    ----------
+    tools : list
+        List in the form
+        [[group1, [tool1, tool2 ...]], [group2, [...]]]
+        Where the tools given by tool1, and tool2 will display in group1.
+        See `add_tool` for details.
+    """
+
+    for group, grouptools in tools:
+        for position, tool in enumerate(grouptools):
+            container.add_tool(tool, group, position)

lib/matplotlib/backends/backend_gtk3.py

@@ -32,8 +32,12 @@ def fn_name(): return sys._getframe(1).f_code.co_name
      FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors, TimerBase
 from matplotlib.backend_bases import (ShowBase, ToolContainerBase,
                                       NavigationBase, StatusbarBase)
-from matplotlib.backend_tools import (SaveFigureBase, ConfigureSubplotsBase,
-    tools, toolbar_tools, SetCursorBase, RubberbandBase)
+from matplotlib.backend_tools import (SaveFigureBase,
+                                      ConfigureSubplotsBase,
+                                      add_tools_2_navigation,
+                                      add_tools_2_container,
+                                      SetCursorBase,
+                                      RubberbandBase)
 
 from matplotlib.cbook import is_string_like, is_writable_file_like
 from matplotlib.colors import colorConverter
@@ -432,8 +436,10 @@ def add_widget(child, expand, fill, padding):
             return size_request.height
 
         if matplotlib.rcParams['toolbar'] == 'navigation':
-            self.navigation.add_tools(tools)
-            self.toolbar.add_tools(toolbar_tools)
+            add_tools_2_navigation(self.navigation)
+#             self.navigation.add_tools(tools)
+#             self.toolbar.add_tools(toolbar_tools)
+            add_tools_2_container(self.toolbar)
             self.statusbar = StatusbarGTK3(self.navigation)
             h += add_widget(self.statusbar, False, False, 0)
             h += add_widget(Gtk.HSeparator(), False, False, 0)

lib/matplotlib/backends/backend_tkagg.py

@@ -22,8 +22,12 @@
 from matplotlib.backend_bases import NavigationToolbar2, cursors, TimerBase
 from matplotlib.backend_bases import (ShowBase, ToolContainerBase,
                                       NavigationBase, StatusbarBase)
-from matplotlib.backend_tools import (SaveFigureBase, ConfigureSubplotsBase,
-    tools, toolbar_tools, SetCursorBase, RubberbandBase)
+from matplotlib.backend_tools import (SaveFigureBase,
+                                      ConfigureSubplotsBase,
+                                      add_tools_2_navigation,
+                                      add_tools_2_container,
+                                      SetCursorBase,
+                                      RubberbandBase)
 from matplotlib._pylab_helpers import Gcf
 
 from matplotlib.figure import Figure
@@ -540,11 +544,10 @@ def __init__(self, canvas, num, window):
         self.statusbar = None
 
         if matplotlib.rcParams['toolbar'] == 'navigation':
-            self.navigation.add_tools(tools)
-            self.toolbar.add_tools(toolbar_tools)
+            add_tools_2_navigation(self.navigation)
+            add_tools_2_container(self.toolbar)
             self.statusbar = StatusbarTk(self.window, self.navigation)
 
-        
         self._shown = False
 
         def notify_axes_change(fig):