changed dependency check for ghostscript, which was failing to identify svn

ddale · ddale · commit d9ecd42404cf · 2007-10-19T15:37:41.000Z
versions

svn path=/trunk/matplotlib/; revision=3968
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -55,7 +55,7 @@
 """
 from __future__ import generators
 
-NEWCONFIG = False
+NEWCONFIG = True
 
 __version__  = '0.90.1'
 __revision__ = '$Revision$'
@@ -243,7 +243,7 @@ def checkdep_ghostscript():
             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
diff --git a/lib/matplotlib/config/checkdep.py b/lib/matplotlib/config/checkdep.py
@@ -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 @@ def ghostscript():
             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 @@ def usetex(s):
                        'unless ghostscript-%s or later is '
                        'installed on your system') % gs_req)
 
-    return flag
+    return flag
