r5348 - trunk/gnue-forms

[reinhard]

Author: reinhard
Date: 2004-03-18 10:42:44 -0600 (Thu, 18 Mar 2004)
New Revision: 5348

Modified:
   trunk/gnue-forms/setup.py
Log:
Return after successful import of wxgtk, because subsequent import of pygtk
will segfault.


Modified: trunk/gnue-forms/setup.py
===================================================================
--- trunk/gnue-forms/setup.py   2004-03-18 10:59:58 UTC (rev 5347)
+++ trunk/gnue-forms/setup.py   2004-03-18 16:42:44 UTC (rev 5348)
@@ -171,12 +171,15 @@
        if wx.__version__[0:2]=='2.':
          print "ok (%s)" % wx.__version__
           UIOK = 1
+          # WORKAROUND:
+          # return now because subsequent import of pygtk will segfault.
+          return
        else:
          print "Version 2.3 or greater needed"
       except ImportError:
         pass
     else:
-      print "check not possible, X11 not working, assuming wxPython is there"  
   
+      print "check not possible, X11 not working, assuming wxPython is there"
       UIOK = 1
 
     # pyGTK 2.0
@@ -185,8 +188,8 @@
       import pygtk
       pygtk.require('2.0')
       import gtk
+      print 'ok.'
       UIOK = 1
-      print 'ok.'
     except ImportError:
       print 'not found.'
     except RuntimeError:
@@ -197,11 +200,11 @@
     print "checking win32all extensions: ",
     try:
       import win32ui
+      print 'ok.'
       UIOK = 1
-      print 'ok.'
+      return
     except ImportError:
       print 'not found.'
-      UIOK = 1
 
     # FIXME: We have more UIDrivers, add check for qt!