Use subprocess instead of commands, works on Windows and avoids the evil

2008-08-24  Colin Walters  <walters@verbum.org>

	* tools/g-ir-scanner: Use subprocess instead of
	commands, works on Windows and avoids the evil
	shell on Unix.

svn path=/trunk/; revision=486

diff --git a/ChangeLog b/ChangeLog
index 04d4741..940e2dd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-24  Colin Walters  <walters@verbum.org>
+
+       * tools/g-ir-scanner: Use subprocess instead of
+       commands, works on Windows and avoids the evil
+       shell on Unix.
+
 2008-08-24  Colin Walters  <walters@verbum.org>
 
        * giscanner/glibtransformer.py: Skip over

diff --git a/tools/g-ir-scanner b/tools/g-ir-scanner
index af24598..48c889e 100755 (executable)
--- a/tools/g-ir-scanner
+++ b/tools/g-ir-scanner
@@ -19,7 +19,7 @@
 # 02110-1301, USA.
 #
 
-import commands
+import subprocess
 import optparse
 import os
 import sys
@@ -135,14 +135,15 @@ def main(args):
     primary_library = options.libraries[0]
 
     for package in options.packages:
-        output = commands.getoutput('pkg-config --cflags %s' % (package, ))
+        output = subprocess.Popen(['pkg-config', '--cflags', package], 
+                                  stdout=subprocess.PIPE).communicate()[0]
         pkg_options, unused = parser.parse_args(output.split())
         options.cpp_includes.extend(pkg_options.cpp_includes)
         options.cpp_defines.extend(pkg_options.cpp_defines)
         options.cpp_undefines.extend(pkg_options.cpp_undefines)
 
-        output = commands.getoutput('pkg-config --libs-only-L %s' % (
-            package, ))
+        output = subprocess.Popen(['pkg-config', '--libs-only-L', package],
+                                  stdout=subprocess.PIPE).communicate()[0]
         pkg_options, unused = parser.parse_args(output.split())
         options.library_paths.extend(pkg_options.library_paths)