import with original name backend_tools

fariza · fariza · commit f09b9ef7c4af · 2015-04-07T15:12:26.000-04:00
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -33,7 +33,7 @@ def fn_name(): return sys._getframe(1).f_code.co_name
 from matplotlib.backend_bases import (ShowBase, ToolContainerBase,
                                       StatusbarBase)
 from matplotlib.backend_managers import ToolManager
-import matplotlib.backend_tools as tools
+from matplotlib import backend_tools
 
 from matplotlib.cbook import is_string_like, is_writable_file_like
 from matplotlib.colors import colorConverter
@@ -432,8 +432,8 @@ def add_widget(child, expand, fill, padding):
             return size_request.height
 
         if matplotlib.rcParams['toolbar'] == 'toolmanager':
-            tools.add_tools_2_toolmanager(self.toolmanager)
-            tools.add_tools_2_container(self.toolbar)
+            backend_tools.add_tools_2_toolmanager(self.toolmanager)
+            backend_tools.add_tools_2_container(self.toolbar)
             self.statusbar = StatusbarGTK3(self.toolmanager)
             h += add_widget(self.statusbar, False, False, 0)
             h += add_widget(Gtk.HSeparator(), False, False, 0)
@@ -731,9 +731,9 @@ def get_filename_from_user (self):
         return filename, self.ext
 
 
-class RubberbandGTK3(tools.RubberbandBase):
+class RubberbandGTK3(backend_tools.RubberbandBase):
     def __init__(self, *args, **kwargs):
-        tools.RubberbandBase.__init__(self, *args, **kwargs)
+        backend_tools.RubberbandBase.__init__(self, *args, **kwargs)
         self.ctx = None
 
     def draw_rubberband(self, x0, y0, x1, y1):
@@ -846,7 +846,7 @@ def set_message(self, s):
         self.push(self._context, s)
 
 
-class SaveFigureGTK3(tools.SaveFigureBase):
+class SaveFigureGTK3(backend_tools.SaveFigureBase):
 
     def get_filechooser(self):
         fc = FileChooserDialog(
@@ -878,14 +878,14 @@ def trigger(self, *args, **kwargs):
                 error_msg_gtk(str(e), parent=self)
 
 
-class SetCursorGTK3(tools.SetCursorBase):
+class SetCursorGTK3(backend_tools.SetCursorBase):
     def set_cursor(self, cursor):
         self.figure.canvas.get_property("window").set_cursor(cursord[cursor])
 
 
-class ConfigureSubplotsGTK3(tools.ConfigureSubplotsBase, Gtk.Window):
+class ConfigureSubplotsGTK3(backend_tools.ConfigureSubplotsBase, Gtk.Window):
     def __init__(self, *args, **kwargs):
-        tools.ConfigureSubplotsBase.__init__(self, *args, **kwargs)
+        backend_tools.ConfigureSubplotsBase.__init__(self, *args, **kwargs)
         self.window = None
 
     def init_window(self):
@@ -1122,10 +1122,10 @@ def error_msg_gtk(msg, parent=None):
     dialog.destroy()
 
 
-tools.ToolSaveFigure = SaveFigureGTK3
-tools.ToolConfigureSubplots = ConfigureSubplotsGTK3
-tools.ToolSetCursor = SetCursorGTK3
-tools.ToolRubberband = RubberbandGTK3
+backend_tools.ToolSaveFigure = SaveFigureGTK3
+backend_tools.ToolConfigureSubplots = ConfigureSubplotsGTK3
+backend_tools.ToolSetCursor = SetCursorGTK3
+backend_tools.ToolRubberband = RubberbandGTK3
 
 Toolbar = ToolbarGTK3
 FigureCanvas = FigureCanvasGTK3
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -23,7 +23,7 @@
 from matplotlib.backend_bases import (ShowBase, ToolContainerBase,
                                       StatusbarBase)
 from matplotlib.backend_managers import ToolManager
-import matplotlib.backend_tools as tools
+from matplotlib import backend_tools
 from matplotlib._pylab_helpers import Gcf
 
 from matplotlib.figure import Figure
@@ -540,8 +540,8 @@ def __init__(self, canvas, num, window):
         self.statusbar = None
 
         if matplotlib.rcParams['toolbar'] == 'toolmanager':
-            tools.add_tools_2_toolmanager(self.toolmanager)
-            tools.add_tools_2_container(self.toolbar)
+            backend_tools.add_tools_2_toolmanager(self.toolmanager)
+            backend_tools.add_tools_2_container(self.toolbar)
             self.statusbar = StatusbarTk(self.window, self.toolmanager)
 
         self._shown = False
@@ -898,9 +898,9 @@ def hidetip(self):
             tw.destroy()
 
 
-class RubberbandTk(tools.RubberbandBase):
+class RubberbandTk(backend_tools.RubberbandBase):
     def __init__(self, *args, **kwargs):
-        tools.RubberbandBase.__init__(self, *args, **kwargs)
+        backend_tools.RubberbandBase.__init__(self, *args, **kwargs)
 
     def draw_rubberband(self, x0, y0, x1, y1):
         height = self.figure.canvas.figure.bbox.height
@@ -924,7 +924,7 @@ def remove_rubberband(self):
             del self.lastrect
 
 
-class SetCursorTk(tools.SetCursorBase):
+class SetCursorTk(backend_tools.SetCursorBase):
     def set_cursor(self, cursor):
         self.figure.canvas.manager.window.configure(cursor=cursord[cursor])
 
@@ -1015,7 +1015,7 @@ def set_message(self, s):
         self._message.set(s)
 
 
-class SaveFigureTk(tools.SaveFigureBase):
+class SaveFigureTk(backend_tools.SaveFigureBase):
     def trigger(self, *args):
         from six.moves import tkinter_tkfiledialog, tkinter_messagebox
         filetypes = self.figure.canvas.get_supported_filetypes().copy()
@@ -1068,9 +1068,9 @@ def trigger(self, *args):
                 tkinter_messagebox.showerror("Error saving file", str(e))
 
 
-class ConfigureSubplotsTk(tools.ConfigureSubplotsBase):
+class ConfigureSubplotsTk(backend_tools.ConfigureSubplotsBase):
     def __init__(self, *args, **kwargs):
-        tools.ConfigureSubplotsBase.__init__(self, *args, **kwargs)
+        backend_tools.ConfigureSubplotsBase.__init__(self, *args, **kwargs)
         self.window = None
 
     def trigger(self, *args):
@@ -1096,10 +1096,10 @@ def destroy(self, *args, **kwargs):
         self.window = None
 
 
-tools.ToolSaveFigure = SaveFigureTk
-tools.ToolConfigureSubplots = ConfigureSubplotsTk
-tools.ToolSetCursor = SetCursorTk
-tools.ToolRubberband = RubberbandTk
+backend_tools.ToolSaveFigure = SaveFigureTk
+backend_tools.ToolConfigureSubplots = ConfigureSubplotsTk
+backend_tools.ToolSetCursor = SetCursorTk
+backend_tools.ToolRubberband = RubberbandTk
 Toolbar = ToolbarTk
 FigureCanvas = FigureCanvasTkAgg
 FigureManager = FigureManagerTkAgg
