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/packaging | |
| 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/packaging')
| -rw-r--r-- | test/packaging/convenience-functions.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/packaging/convenience-functions.py b/test/packaging/convenience-functions.py index 95543839..66374e3a 100644 --- a/test/packaging/convenience-functions.py +++ b/test/packaging/convenience-functions.py @@ -29,7 +29,6 @@ Test the FindInstalledFiles() and the FindSourceFiles() functions. """ import os.path -import string import TestSCons python = TestSCons.python @@ -44,8 +43,8 @@ env = Environment(tools=['default', 'packaging']) prog = env.Install( 'bin/', ["f1", "f2"] ) env.File( "f3" ) -src_files = map(str, env.FindSourceFiles()) -oth_files = map(str, env.FindInstalledFiles()) +src_files = list(map(str, env.FindSourceFiles())) +oth_files = list(map(str, env.FindInstalledFiles())) src_files.sort() oth_files.sort() @@ -56,8 +55,8 @@ print oth_files bin_f1 = os.path.join('bin', 'f1') bin_f2 = os.path.join('bin', 'f2') -bin__f1 = string.replace(bin_f1, '\\', '\\\\') -bin__f2 = string.replace(bin_f2, '\\', '\\\\') +bin__f1 = bin_f1.replace('\\', '\\\\') +bin__f2 = bin_f2.replace('\\', '\\\\') expect_read = """\ ['SConstruct', 'f1', 'f2', 'f3'] |