summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Platform
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2008-10-07 00:40:11 (GMT)
committerSteven Knight <knight@baldmt.com>2008-10-07 00:40:11 (GMT)
commitd91fcf97d58b71e4ec57b405be51dd1f923eff79 (patch)
treebc7ebfee28b3e34b86c38837c6a951c6121f8a0a /src/engine/SCons/Platform
parenta60a83619bc1524c2014fc897fdfd64c1ab3684d (diff)
downloadSCons-d91fcf97d58b71e4ec57b405be51dd1f923eff79.zip
SCons-d91fcf97d58b71e4ec57b405be51dd1f923eff79.tar.gz
SCons-d91fcf97d58b71e4ec57b405be51dd1f923eff79.tar.bz2
Initial Python 2.6 portability in SCons code itself, using subprocess
in place of popen2, and calling hashlib.md5() instead of the md5 module.
Diffstat (limited to 'src/engine/SCons/Platform')
-rw-r--r--src/engine/SCons/Platform/posix.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
index bc8d67c..12a6f60 100644
--- a/src/engine/SCons/Platform/posix.py
+++ b/src/engine/SCons/Platform/posix.py
@@ -35,8 +35,8 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
import errno
import os
import os.path
-import popen2
import string
+import subprocess
import sys
import select
@@ -131,8 +131,10 @@ def process_cmd_output(cmd_stdout, cmd_stderr, stdout, stderr):
raise
def exec_popen3(l, env, stdout, stderr):
- proc = popen2.Popen3(string.join(l), 1)
- process_cmd_output(proc.fromchild, proc.childerr, stdout, stderr)
+ proc = subprocess.Popen(string.join(l),
+ stdout=stdout,
+ stderr=stderr,
+ shell=True)
stat = proc.wait()
if stat & 0xff:
return stat | 0x80