SF.net SVN: matplotlib: [4346] trunk/matplotlib/setupext.py

[<ds...@us...>]

Revision: 4346
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4346&view=rev
Author:   dsdale
Date:     2007-11-16 13:47:17 -0800 (Fri, 16 Nov 2007)

Log Message:
-----------
fixed version checking for traits-3

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

Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py	2007-11-16 20:29:51 UTC (rev 4345)
+++ trunk/matplotlib/setupext.py	2007-11-16 21:47:17 UTC (rev 4346)
@@ -465,11 +465,16 @@
             print_status("enthought.traits", "unknown and incompatible version: < 2.0")
             return False
         else:
-            if version.version.endswith('mpl'):
+            # traits 2 and 3 store their version strings in different places:
+            try:
+                version = version.version
+            except AttributeError:
+                version = version.__version__
+            if version.endswith('mpl'):
                 print_status("enthought.traits", "matplotlib will provide")
                 return True
             else:
-                print_status("enthought.traits", version.version)
+                print_status("enthought.traits", version)
                 return False
     except ImportError:
         if options['provide_traits']:


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