summaryrefslogtreecommitdiff
path: root/test/SHELL.py
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 +0000
committerGreg Noel <GregNoel@tigris.org>2010-03-25 04:14:28 +0000
commitaf6d7c35464bb75dcabc72094b4bd84154dde50d (patch)
tree0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /test/SHELL.py
parent55ef7fe83e3211be3045f089767ca8e198db1c2c (diff)
downloadscons-af6d7c35464bb75dcabc72094b4bd84154dde50d.tar.gz
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/SHELL.py')
-rw-r--r--test/SHELL.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/SHELL.py b/test/SHELL.py
index fa1ae78e..93ed0b13 100644
--- a/test/SHELL.py
+++ b/test/SHELL.py
@@ -48,7 +48,6 @@ my_shell = test.workpath('my_shell.py')
test.write(my_shell, """\
#!%(python)s
import os
-import string
import sys
cmd = sys.argv[2]
def stripquote(s):
@@ -56,8 +55,8 @@ def stripquote(s):
s[0] == "'" and s[-1] == "'":
s = s[1:-1]
return s
-args = string.split(stripquote(sys.argv[2]))
-args = map(stripquote, args)
+args = stripquote(sys.argv[2]).split()
+args = list(map(stripquote, args))
ofp = open(args[2], 'wb')
for f in args[3:] + ['extra.txt']:
ofp.write(open(f, 'rb').read())