SF.net SVN: matplotlib: [3968] trunk/matplotlib/lib/matplotlib

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

Revision: 3968
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3968&view=rev
Author:   dsdale
Date:     2007-10-19 08:37:41 -0700 (Fri, 19 Oct 2007)

Log Message:
-----------
changed dependency check for ghostscript, which was failing to identify svn 
versions

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/__init__.py
    trunk/matplotlib/lib/matplotlib/config/checkdep.py

Modified: trunk/matplotlib/lib/matplotlib/__init__.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/__init__.py	2007-10-19 14:43:21 UTC (rev 3967)
+++ trunk/matplotlib/lib/matplotlib/__init__.py	2007-10-19 15:37:41 UTC (rev 3968)
@@ -55,7 +55,7 @@
 """
 from __future__ import generators
 
-NEWCONFIG = False
+NEWCONFIG = True
 
 __version__  = '0.90.1'
 __revision__ = '$Revision$'
@@ -243,7 +243,7 @@
             command = 'gs -v'
         stdin, stdout = os.popen4(command)
         line = stdout.readlines()[0]
-        v = line.split()[2]
+        v = line.split()[-2]
         vtest = '.'.join(v.split('.')[:2]) # deal with version numbers like '7.07.1'
         float(vtest)
         return vtest

Modified: trunk/matplotlib/lib/matplotlib/config/checkdep.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/config/checkdep.py	2007-10-19 14:43:21 UTC (rev 3967)
+++ trunk/matplotlib/lib/matplotlib/config/checkdep.py	2007-10-19 15:37:41 UTC (rev 3968)
@@ -1,4 +1,7 @@
-import os, re, sys
+import os
+import re
+import sys
+import warnings
 import distutils.version as version
 
 def dvipng():
@@ -19,7 +22,7 @@
             command = 'gs -v'
         stdin, stdout = os.popen4(command)
         line = stdout.readlines()[0]
-        v = line.split()[2]
+        v = line.split()[-2]
         vtest = '.'.join(v.split('.')[:2]) # deal with version numbers like '7.07.1'
         float(vtest)
         return vtest
@@ -130,4 +133,4 @@
                        'unless ghostscript-%s or later is '
                        'installed on your system') % gs_req)
 
-    return flag
\ No newline at end of file
+    return flag


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