Minor cleanup; removed old ipython hack.

efiring · efiring · commit 3fd13b32e330 · 2007-11-05T19:49:27.000Z
svn path=/trunk/matplotlib/; revision=4112
diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py
@@ -6,7 +6,7 @@
            'new_figure_manager', 'backend_version']
 
 interactive_bk = ['GTK', 'GTKAgg', 'GTKCairo', 'FltkAgg', 'QtAgg', 'Qt4Agg',
-                  'TkAgg', 'WX', 'WXAgg', 'CocoaAgg', 'Aqt']
+                  'TkAgg', 'WX', 'WXAgg', 'CocoaAgg']
 non_interactive_bk = ['Agg2', 'Agg', 'Cairo', 'EMF', 'GDK',
                       'Pdf', 'PS', 'SVG', 'Template']
 all_backends = interactive_bk + non_interactive_bk
@@ -50,7 +50,4 @@ def show(): pass
 
     return new_figure_manager, draw_if_interactive, show
 
-# 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/pyplot.py b/lib/matplotlib/pyplot.py
@@ -33,20 +33,15 @@
 
 ## Global ##
 
-# a hack to keep old versions of ipython working with mpl after bug
-# fix #1209354
-if 'IPython.Shell' in  sys.modules:
-    from matplotlib.backends import new_figure_manager, draw_if_interactive, show
-else:
-    from matplotlib.backends import pylab_setup
-    new_figure_manager, draw_if_interactive, show = pylab_setup()
+from matplotlib.backends import pylab_setup
+new_figure_manager, draw_if_interactive, show = pylab_setup()
 
 def switch_backend(newbackend):
     """
     Swtich the default backend to newbackend.  This feature is
     EXPERIMENTAL, and is only expected to work switching to an image
     backend.  Eg, if you have a bunch of PS scripts that you want to
-    run from an interactive ipython session, yuo may want to switch to
+    run from an interactive ipython session, you may want to switch to
     the PS backend before running them to avoid having a bunch of GUI
     windows popup.  If you try to interactively switch from one GUI
     backend to another, you will explode.
