change to backend_gtkcairo to make it play well with IPython

ddale · ddale · commit 072f173e0eb7 · 2007-01-11T21:41:30.000Z
svn path=/trunk/matplotlib/; revision=2979
diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py
@@ -1,5 +1,6 @@
 import sys
 import matplotlib
+import time
 
 __all__ = ['backend','show','draw_if_interactive',
            'new_figure_manager', 'backend_version']
@@ -49,8 +50,7 @@ def show(): pass
 
     return new_figure_manager, draw_if_interactive, show
 
-# a hack to keep old versions of ipython working with mpl after bug
-# fix #1209354
+# a hack to keep old versions of ipython working with mpl
 if 'IPython.Shell' in  sys.modules:
     new_figure_manager, draw_if_interactive, show = pylab_setup()
 
diff --git a/lib/matplotlib/backends/backend_gtkagg.py b/lib/matplotlib/backends/backend_gtkagg.py
@@ -6,12 +6,12 @@
 
 import matplotlib
 from matplotlib.figure import Figure
-from backend_agg import FigureCanvasAgg
-from backend_gtk import gtk, FigureManagerGTK, FigureCanvasGTK,\
+from matplotlib.backends.backend_agg import FigureCanvasAgg
+from matplotlib.backends.backend_gtk import gtk, FigureManagerGTK, FigureCanvasGTK,\
      show, draw_if_interactive,\
      error_msg_gtk, NavigationToolbar, PIXELS_PER_INCH, backend_version, \
      NavigationToolbar2GTK
-from _gtkagg import agg_to_gtk_drawable
+from matplotlib.backends._gtkagg import agg_to_gtk_drawable
 
 
 DEBUG = False
diff --git a/lib/matplotlib/backends/backend_gtkcairo.py b/lib/matplotlib/backends/backend_gtkcairo.py
@@ -6,11 +6,11 @@
 if gtk.pygtk_version < (2,7,0):
     import cairo.gtk
 
-import matplotlib.backends.backend_cairo as be_cairo
+from matplotlib.backends import backend_cairo
 from   matplotlib.backends.backend_gtk import *
 
 backend_version = 'PyGTK(%d.%d.%d) ' % gtk.pygtk_version + \
-                  'Pycairo(%s)' % be_cairo.backend_version
+                  'Pycairo(%s)' % backend_cairo.backend_version
 
 
 _debug = False
@@ -28,7 +28,7 @@ def new_figure_manager(num, *args, **kwargs):
     return FigureManagerGTK(canvas, num)
 
 
-class RendererGTKCairo (be_cairo.RendererCairo):
+class RendererGTKCairo (backend_cairo.RendererCairo):
     def set_pixmap (self, pixmap):
         if gtk.pygtk_version >= (2,7,0):
             self.ctx = pixmap.cairo_create()
