diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-03-25 04:14:28 +0000 |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-03-25 04:14:28 +0000 |
| commit | af6d7c35464bb75dcabc72094b4bd84154dde50d (patch) | |
| tree | 0984fd581082c27cfbfbb7f94d5751b0e6fd2741 /test/Interactive | |
| parent | 55ef7fe83e3211be3045f089767ca8e198db1c2c (diff) | |
| download | scons-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/Interactive')
| -rw-r--r-- | test/Interactive/implicit-VariantDir.py | 3 | ||||
| -rw-r--r-- | test/Interactive/shell.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/test/Interactive/implicit-VariantDir.py b/test/Interactive/implicit-VariantDir.py index 8975e900..5ef4583d 100644 --- a/test/Interactive/implicit-VariantDir.py +++ b/test/Interactive/implicit-VariantDir.py @@ -37,7 +37,6 @@ deps must be cleared on the source files. """ import os.path -import string import TestSCons @@ -94,7 +93,7 @@ test.write(['src', 'inc', 'foo.h'], """ # Start scons, to build only "build/foo" build_foo_exe = os.path.join('build', 'foo' + TestSCons._exe) -_build_foo_exe_ = '"%s"' % string.replace(build_foo_exe, '\\', '\\\\') +_build_foo_exe_ = '"%s"' % build_foo_exe.replace('\\', '\\\\') abs_foo_exe = test.workpath(build_foo_exe) scons = test.start(arguments = '--interactive', combine=1) diff --git a/test/Interactive/shell.py b/test/Interactive/shell.py index 4e4907a0..f4e89bd9 100644 --- a/test/Interactive/shell.py +++ b/test/Interactive/shell.py @@ -28,7 +28,6 @@ Verify the ability of the "shell" command (and its "sh" and "!" aliases) to shell out of interactive mode. """ -import string import sys import TestSCons @@ -38,7 +37,7 @@ test = TestSCons.TestSCons(combine=1) _python_ = TestSCons._python_ shell_command_py = test.workpath('shell_command.py') -_shell_command_py_ = '"%s"' % string.replace(shell_command_py, '\\', '\\\\') +_shell_command_py_ = '"%s"' % shell_command_py.replace('\\', '\\\\') test.write(shell_command_py, """\ print 'hello from shell_command.py' |