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/Builder | |
| 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/Builder')
| -rw-r--r-- | test/Builder/multi/same-overrides.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/Builder/multi/same-overrides.py b/test/Builder/multi/same-overrides.py index 5a3a7f8c..9a428a27 100644 --- a/test/Builder/multi/same-overrides.py +++ b/test/Builder/multi/same-overrides.py @@ -28,8 +28,6 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" Verify that everything works if two multi calls have the same overrides. """ -import string - import TestSCons test = TestSCons.TestSCons(match=TestSCons.match_re) @@ -56,7 +54,7 @@ env.B(target = 'file4.out', source = 'file4b.in', foo=3) test.write('file4a.in', 'file4a.in\n') test.write('file4b.in', 'file4b.in\n') -python_expr = string.replace(TestSCons.python, '\\', '\\\\') +python_expr = TestSCons.python.replace('\\', '\\\\') act = TestSCons.re_escape('"%s" build.py \$foo \$TARGET \$SOURCES' % python_expr) expect = (""" |