Merged revisions 8557 via svnmerge from

efiring · efiring · commit bce5b8d8a29a · 2010-07-15T20:47:28.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint ........ r8557 | efiring | 2010-07-15 10:45:19 -1000 (Thu, 15 Jul 2010) | 3 lines show for tkagg doesn't block in script called via ipython -pylab. This is the first in an expected series of changes to show(). ........ svn path=/trunk/matplotlib/; revision=8558
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):
     """
