Rudimentary Python 2.6 portability in the test infrastructure, fixing

"import popen2" warnings that interfere with some of the tests executing
cleanly.  This converts to using subprocess by default, falling back
to popen2 if it's not available.

1 files changed, 11 insertions, 4 deletions

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index c5180d8..a35bf8d 100644
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -100,12 +100,19 @@ def gccFortranLibs():
     a more reliable way, but using popen3 is relatively efficient."""
 
     libs = ['g2c']
+    cmd = 'gcc -v'
 
     try:
-        import popen2
-        stderr = popen2.popen3('gcc -v')[2]
-    except OSError:
-        return libs
+        import subprocess
+    except ImportError:
+        try:
+            import popen2
+            stderr = popen2.popen3(cmd)[2]
+        except OSError:
+            return libs
+    else:
+        p = subprocess.Popen(cmd, shell=True, stderr=subprocess.PIPE)
+        stderr = p.stderr
 
     for l in stderr.readlines():
         list = string.split(l)