Revision: 4112
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4112&view=rev
Author: efiring
Date: 2007-11-05 11:49:27 -0800 (Mon, 05 Nov 2007)
Log Message:
-----------
Minor cleanup; removed old ipython hack.
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/backends/__init__.py
trunk/matplotlib/lib/matplotlib/pyplot.py
Modified: trunk/matplotlib/lib/matplotlib/backends/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/__init__.py 2007-11-05
19:47:27 UTC (rev 4111)
+++ trunk/matplotlib/lib/matplotlib/backends/__init__.py 2007-11-05
19:49:27 UTC (rev 4112)
@@ -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 @@
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()
Modified: trunk/matplotlib/lib/matplotlib/pyplot.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pyplot.py 2007-11-05 19:47:27 UTC (rev
4111)
+++ trunk/matplotlib/lib/matplotlib/pyplot.py 2007-11-05 19:49:27 UTC (rev
4112)
@@ -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.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
