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.

3 files changed, 3 insertions, 6 deletions

diff --git a/test/Progress/TARGET.py b/test/Progress/TARGET.py
index c2b42138..d7ff3c96 100644
--- a/test/Progress/TARGET.py
+++ b/test/Progress/TARGET.py
@@ -30,7 +30,6 @@ overwriting it by setting the overwrite= keyword argument.
 """
 
 import os
-import string
 
 import TestSCons
 
@@ -59,7 +58,7 @@ S1.in\r     \rS1.out\rCopy("S1.out", "S1.in")
       \rSConstruct\r          \r.\r"""
 
 if os.linesep != '\n':
-    expect = string.replace(expect, '\n', os.linesep)
+    expect = expect.replace('\n', os.linesep)
 
 test.run(arguments = '-Q .', stdout=expect)
 
diff --git a/test/Progress/file.py b/test/Progress/file.py
index 6095fb0b..3184a5b8 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)
 
diff --git a/test/Progress/spinner.py b/test/Progress/spinner.py
index 0919b445..85ca32f2 100644
--- a/test/Progress/spinner.py
+++ b/test/Progress/spinner.py
@@ -30,7 +30,6 @@ that represents a canonical "spinner" on the output.
 """
 
 import os
-import string
 
 import TestSCons
 
@@ -59,7 +58,7 @@ expect = """\
 \\\r|\r"""
 
 if os.linesep != '\n':
-    expect = string.replace(expect, '\n', os.linesep)
+    expect = expect.replace('\n', os.linesep)
 
 test.run(arguments = '-Q .', stdout=expect)