SF.net SVN: matplotlib:[7113] trunk/matplotlib

[<jd...@us...>]

Revision: 7113
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7113&view=rev
Author:   jdh2358
Date:     2009-05-17 18:00:10 +0000 (Sun, 17 May 2009)

Log Message:
-----------
applied Michiel's sf patch 2790638 to turn off gtk event for setupext

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/setupext.py

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009-05-17 15:08:07 UTC (rev 7112)
+++ trunk/matplotlib/CHANGELOG	2009-05-17 18:00:10 UTC (rev 7113)
@@ -1,6 +1,10 @@
-2009-05-19 applied Michiel's sf patch 2792742 to speed up Cairo and
-           macosx collections; speedups can be 20x
+2009-05-17 applied Michiel's sf patch 2790638 to turn off gtk event
+           loop in setupext for pygtk>=2.15.10 - JDH
 
+2009-05-17 applied Michiel's sf patch 2792742 to speed up Cairo and
+           macosx collections; speedups can be 20x.  Also fixes some
+           bugs in which gc got into inconsistent state
+
 ======================================================================
 
 2008-05-17 Release 0.98.5.3 at r7107 from the branch - JDH

Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py	2009-05-17 15:08:07 UTC (rev 7112)
+++ trunk/matplotlib/setupext.py	2009-05-17 18:00:10 UTC (rev 7113)
@@ -595,6 +595,13 @@
     if explanation is not None:
         print_message(explanation)
 
+    # Switch off the event loop for PyGTK >= 2.15.0
+    if gotit:
+        try:
+            gtk.set_interactive(False)
+        except AttributeError: # PyGTK < 2.15.0
+            pass
+
     return gotit
 
 def add_pygtk_flags(module):
@@ -842,6 +849,7 @@
         tk.withdraw()
         tcl_lib_dir = str(tk.getvar('tcl_library'))
         tk_lib_dir = str(tk.getvar('tk_library'))
+        tk.destroy()
 
     # Save directories and version string to cache
     TCL_TK_CACHE = tcl_lib_dir, tk_lib_dir, str(Tkinter.TkVersion)[:3]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.