summaryrefslogtreecommitdiffstats
path: root/test/Progress/file.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/Progress/file.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/Progress/file.py')
-rw-r--r--test/Progress/file.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/Progress/file.py b/test/Progress/file.py
index 6095fb0..3184a5b 100644
--- a/test/Progress/file.py
+++ b/test/Progress/file.py
@@ -30,7 +30,6 @@ progress output.
"""
import os
-import string
import TestSCons
@@ -74,7 +73,7 @@ stderr: .
"""
if os.linesep != '\n':
- expect = string.replace(expect, '\n', os.linesep)
+ expect = expect.replace('\n', os.linesep)
test.must_match('progress.out', expect)