summaryrefslogtreecommitdiffstats
path: root/test/SPAWN.py
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 (GMT)
committerGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 (GMT)
commit22d352500f1cd6bd0c53d788a5dc44a1fefa676e (patch)
tree0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /test/SPAWN.py
parent75ac32ac8e32076e25b72a19eb56340cc585fa4e (diff)
downloadSCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.zip
SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.tar.gz
SCons-22d352500f1cd6bd0c53d788a5dc44a1fefa676e.tar.bz2
Move 2.0 changes collected in branches/pending back to trunk for further
development. Note that this set of changes is NOT backward-compatible; the trunk no longer works with Python 1.5.2, 2.0, or 2.1.
Diffstat (limited to 'test/SPAWN.py')
-rw-r--r--test/SPAWN.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/SPAWN.py b/test/SPAWN.py
index c7cd4e4..6802524 100644
--- a/test/SPAWN.py
+++ b/test/SPAWN.py
@@ -44,15 +44,14 @@ ofp.close()
test.write('SConstruct', """
import os
-import string
import sys
def my_spawn1(sh, escape, cmd, args, env):
- s = string.join(args + ['extra1.txt'])
+ s = " ".join(args + ['extra1.txt'])
if sys.platform in ['win32']:
s = '"' + s + '"'
os.system(s)
def my_spawn2(sh, escape, cmd, args, env):
- s = string.join(args + ['extra2.txt'])
+ s = " ".join(args + ['extra2.txt'])
if sys.platform in ['win32']:
s = '"' + s + '"'
os.system(s)