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, 4 insertions, 6 deletions

diff --git a/test/SWIG/SWIGCOM.py b/test/SWIG/SWIGCOM.py
index d1d77763..44602fda 100644
--- a/test/SWIG/SWIGCOM.py
+++ b/test/SWIG/SWIGCOM.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 != '/*swig*/\\n', infile.readlines()):
+    for l in [l for l in infile.readlines() if l != '/*swig*/\\n']:
         outfile.write(l)
 sys.exit(0)
 """)
diff --git a/test/SWIG/SWIGCOMSTR.py b/test/SWIG/SWIGCOMSTR.py
index 739c7811..1df3499e 100644
--- a/test/SWIG/SWIGCOMSTR.py
+++ b/test/SWIG/SWIGCOMSTR.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 != '/*swig*/\\n', infile.readlines()):
+    for l in [l for l in infile.readlines() if l != '/*swig*/\\n']:
         outfile.write(l)
 sys.exit(0)
 """)
diff --git a/test/SWIG/live.py b/test/SWIG/live.py
index 0a4c9059..8f580c97 100644
--- a/test/SWIG/live.py
+++ b/test/SWIG/live.py
@@ -29,7 +29,6 @@ Test SWIG behavior with a live, installed SWIG.
 """
 
 import os.path
-import string
 import sys
 
 import TestSCons
@@ -58,11 +57,10 @@ ldmodule_prefix = '_'
 
 test.write("wrapper.py",
 """import os
-import string
 import sys
 open('%s', 'wb').write("wrapper.py\\n")
-os.system(string.join(sys.argv[1:], " "))
-""" % string.replace(test.workpath('wrapper.out'), '\\', '\\\\'))
+os.system(" ".join(sys.argv[1:]))
+""" % test.workpath('wrapper.out').replace('\\', '\\\\'))
 
 test.write('SConstruct', """\
 foo = Environment(SWIGFLAGS='-python',