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.

5 files changed, 6 insertions, 8 deletions

diff --git a/test/MSVC/PCHCOM.py b/test/MSVC/PCHCOM.py
index 56718ef1..ff27e10e 100644
--- a/test/MSVC/PCHCOM.py
+++ b/test/MSVC/PCHCOM.py
@@ -41,7 +41,7 @@ import sys
 outfile = open(sys.argv[1], 'wb')
 for f in sys.argv[2:]:
     infile = open(f, 'rb')
-    for l in filter(lambda l: l != '/*pch*/\\n', infile.readlines()):
+    for l in [l for l in infile.readlines() if l != '/*pch*/\\n']:
         outfile.write(l)
 sys.exit(0)
 """)
diff --git a/test/MSVC/PCHCOMSTR.py b/test/MSVC/PCHCOMSTR.py
index a3ee99e1..51f56fb1 100644
--- a/test/MSVC/PCHCOMSTR.py
+++ b/test/MSVC/PCHCOMSTR.py
@@ -42,7 +42,7 @@ import sys
 outfile = open(sys.argv[1], 'wb')
 for f in sys.argv[2:]:
     infile = open(f, 'rb')
-    for l in filter(lambda l: l != '/*pch*/\\n', infile.readlines()):
+    for l in [l for l in infile.readlines() if l != '/*pch*/\\n']:
         outfile.write(l)
 sys.exit(0)
 """)
diff --git a/test/MSVC/RCCOM.py b/test/MSVC/RCCOM.py
index babc4c7d..05382b86 100644
--- a/test/MSVC/RCCOM.py
+++ b/test/MSVC/RCCOM.py
@@ -42,7 +42,7 @@ import sys
 outfile = open(sys.argv[1], 'wb')
 for f in sys.argv[2:]:
     infile = open(f, 'rb')
-    for l in filter(lambda l: l != '/*rc*/\\n', infile.readlines()):
+    for l in [l for l in infile.readlines() if l != '/*rc*/\\n']:
         outfile.write(l)
 sys.exit(0)
 """)
diff --git a/test/MSVC/RCCOMSTR.py b/test/MSVC/RCCOMSTR.py
index b346f489..8425d73e 100644
--- a/test/MSVC/RCCOMSTR.py
+++ b/test/MSVC/RCCOMSTR.py
@@ -42,7 +42,7 @@ import sys
 outfile = open(sys.argv[1], 'wb')
 for f in sys.argv[2:]:
     infile = open(f, 'rb')
-    for l in filter(lambda l: l != '/*rc*/\\n', infile.readlines()):
+    for l in [l for l in infile.readlines() if l != '/*rc*/\\n']:
         outfile.write(l)
 sys.exit(0)
 """)
diff --git a/test/MSVC/batch.py b/test/MSVC/batch.py
index 0ab116c7..f089b605 100644
--- a/test/MSVC/batch.py
+++ b/test/MSVC/batch.py
@@ -40,7 +40,6 @@ _python_ = TestSCons._python_
 
 test.write('fake_cl.py', """\
 import os
-import string
 import sys
 input_files = sys.argv[2:]
 if sys.argv[1][-1] in (os.sep, '\\\\'):
@@ -56,17 +55,16 @@ else:
 # Delay writing the .log output until here so any trailing slash or
 # backslash has been stripped, and the output comparisons later in this
 # script don't have to account for the difference.
-open('fake_cl.log', 'ab').write(string.join(sys.argv[1:]) + '\\n')
+open('fake_cl.log', 'ab').write(" ".join(sys.argv[1:]) + '\\n')
 for infile in input_files:
     if dir:
-        outfile = os.path.join(dir, string.replace(infile, '.c', '.obj'))
+        outfile = os.path.join(dir, infile.replace('.c', '.obj'))
     else:
         outfile = output
     open(outfile, 'wb').write(open(infile, 'rb').read())
 """)
 
 test.write('fake_link.py', """\
-import string
 import sys
 ofp = open(sys.argv[1], 'wb')
 for infile in sys.argv[2:]: