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.

1 files changed, 4 insertions, 5 deletions

diff --git a/test/option-j.py b/test/option-j.py
index 83597ca..3eb7bd3 100644
--- a/test/option-j.py
+++ b/test/option-j.py
@@ -30,7 +30,6 @@ SConscript settable option.
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import os.path
-import string
 
 import TestSCons
 
@@ -91,10 +90,10 @@ def RunTest(args, extra):
     test.run(arguments = args)
 
     str = test.read("f1")
-    start1,finish1 = map(float, string.split(str, "\n"))
+    start1,finish1 = list(map(float, str.split("\n")))
 
     str = test.read("f2")
-    start2,finish2 = map(float, string.split(str, "\n"))
+    start2,finish2 = list(map(float, str.split("\n")))
 
     return start2, finish1
 
@@ -149,10 +148,10 @@ warn = \
 test.must_contain_all_lines(test.stderr(), [warn])
 
 str = test.read("f1")
-start1,finish1 = map(float, string.split(str, "\n"))
+start1,finish1 = list(map(float, str.split("\n")))
 
 str = test.read("f2")
-start2,finish2 = map(float, string.split(str, "\n"))
+start2,finish2 = list(map(float, str.split("\n")))
 
 test.fail_test(start2 < finish1)