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

[<md...@us...>]

Revision: 3649
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3649&view=rev
Author:   mdboom
Date:     2007-08-01 05:26:55 -0700 (Wed, 01 Aug 2007)

Log Message:
-----------
Fix wx check and build

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

Modified: trunk/matplotlib/setup.py
===================================================================
--- trunk/matplotlib/setup.py	2007-08-01 12:19:03 UTC (rev 3648)
+++ trunk/matplotlib/setup.py	2007-08-01 12:26:55 UTC (rev 3649)
@@ -238,7 +238,7 @@
 if check_for_wx() and BUILD_WXAGG:
     BUILD_AGG = 1
     import wx
-    if wx.__version__ < (2.8):
+    if getattr(wx, '__version__', '0.0')[0:3] < '2.8':
         build_wxagg(ext_modules, packages)
         wxagg_backend_status = "yes"
     else:

Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py	2007-08-01 12:19:03 UTC (rev 3648)
+++ trunk/matplotlib/setupext.py	2007-08-01 12:26:55 UTC (rev 3649)
@@ -485,14 +485,15 @@
                 gotit = True
 
     if gotit:
-        module = Extension("test", [])
-        add_wx_flags(module, wxconfig)
-        if not find_include_file(
-            module.include_dirs,
-            os.path.join("wx", "wxPython", "wxPython.h")):
-            explanation = ("Could not find wxPython headers in any of %s" %
-                           ", ".join(["'%s'" % x for x in module.include_dirs]))
-            gotit = False
+        if getattr(wx, '__version__', '0.0')[0:3] < '2.8':
+            module = Extension("test", [])
+            add_wx_flags(module, wxconfig)
+            if not find_include_file(
+                module.include_dirs,
+                os.path.join("wx", "wxPython", "wxPython.h")):
+                explanation = ("Could not find wxPython headers in any of %s" %
+                               ", ".join(["'%s'" % x for x in module.include_dirs]))
+                gotit = False
 
     if gotit:
         print_status("wxPython", wx.__version__)


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