show for tkagg doesn't block in script called via ipython -pylab.

efiring · efiring · commit e9f4af668803 · 2010-07-15T20:45:19.000Z
This is the first in an expected series of changes to show().

svn path=/branches/v1_0_maint/; revision=8557
diff --git a/lib/matplotlib/backends/backend_tkagg.py b/lib/matplotlib/backends/backend_tkagg.py
@@ -71,7 +71,13 @@ def show():
     """
     for manager in Gcf.get_all_fig_managers():
         manager.show()
-    Tk.mainloop()
+    try:
+        if not show._needmain: # might have been added by ipython
+            return
+    except AttributeError:
+        pass
+    if not matplotlib.is_interactive():
+        Tk.mainloop()
 
 def new_figure_manager(num, *args, **kwargs):
     """
