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.

6 files changed, 12 insertions, 18 deletions

diff --git a/test/Rpcgen/RPCGEN.py b/test/Rpcgen/RPCGEN.py
index 5fde5dff..dd3669b3 100644
--- a/test/Rpcgen/RPCGEN.py
+++ b/test/Rpcgen/RPCGEN.py
@@ -35,15 +35,14 @@ test = TestSCons.TestSCons()
 
 test.write('myrpcgen.py', """
 import getopt
-import string
 import sys
 cmd_opts, args = getopt.getopt(sys.argv[1:], 'chlmo:', [])
 for opt, arg in cmd_opts:
     if opt == '-o': output = open(arg, 'wb')
-output.write(string.join(sys.argv) + "\\n")
+output.write(" ".join(sys.argv) + "\\n")
 for a in args:
     contents = open(a, 'rb').read()
-    output.write(string.replace(contents, 'RPCGEN', 'myrpcgen.py'))
+    output.write(contents.replace('RPCGEN', 'myrpcgen.py'))
 output.close()
 sys.exit(0)
 """)
diff --git a/test/Rpcgen/RPCGENCLIENTFLAGS.py b/test/Rpcgen/RPCGENCLIENTFLAGS.py
index 4b0d24f5..7cf0144b 100644
--- a/test/Rpcgen/RPCGENCLIENTFLAGS.py
+++ b/test/Rpcgen/RPCGENCLIENTFLAGS.py
@@ -35,15 +35,14 @@ test = TestSCons.TestSCons()
 
 test.write('myrpcgen.py', """
 import getopt
-import string
 import sys
 cmd_opts, args = getopt.getopt(sys.argv[1:], 'chlmo:x', [])
 for opt, arg in cmd_opts:
     if opt == '-o': output = open(arg, 'wb')
-output.write(string.join(sys.argv) + "\\n")
+output.write(" ".join(sys.argv) + "\\n")
 for a in args:
     contents = open(a, 'rb').read()
-    output.write(string.replace(contents, 'RPCGEN', 'myrpcgen.py'))
+    output.write(contents.replace('RPCGEN', 'myrpcgen.py'))
 output.close()
 sys.exit(0)
 """)
diff --git a/test/Rpcgen/RPCGENFLAGS.py b/test/Rpcgen/RPCGENFLAGS.py
index ddbc745d..4af5da8f 100644
--- a/test/Rpcgen/RPCGENFLAGS.py
+++ b/test/Rpcgen/RPCGENFLAGS.py
@@ -35,15 +35,14 @@ test = TestSCons.TestSCons()
 
 test.write('myrpcgen.py', """
 import getopt
-import string
 import sys
 cmd_opts, args = getopt.getopt(sys.argv[1:], 'chlmo:x', [])
 for opt, arg in cmd_opts:
     if opt == '-o': output = open(arg, 'wb')
-output.write(string.join(sys.argv) + "\\n")
+output.write(" ".join(sys.argv) + "\\n")
 for a in args:
     contents = open(a, 'rb').read()
-    output.write(string.replace(contents, 'RPCGEN', 'myrpcgen.py'))
+    output.write(contents.replace('RPCGEN', 'myrpcgen.py'))
 output.close()
 sys.exit(0)
 """)
diff --git a/test/Rpcgen/RPCGENHEADERFLAGS.py b/test/Rpcgen/RPCGENHEADERFLAGS.py
index 3eac78f6..0c93fe7a 100644
--- a/test/Rpcgen/RPCGENHEADERFLAGS.py
+++ b/test/Rpcgen/RPCGENHEADERFLAGS.py
@@ -35,15 +35,14 @@ test = TestSCons.TestSCons()
 
 test.write('myrpcgen.py', """
 import getopt
-import string
 import sys
 cmd_opts, args = getopt.getopt(sys.argv[1:], 'chlmo:x', [])
 for opt, arg in cmd_opts:
     if opt == '-o': output = open(arg, 'wb')
-output.write(string.join(sys.argv) + "\\n")
+output.write(" ".join(sys.argv) + "\\n")
 for a in args:
     contents = open(a, 'rb').read()
-    output.write(string.replace(contents, 'RPCGEN', 'myrpcgen.py'))
+    output.write(contents.replace('RPCGEN', 'myrpcgen.py'))
 output.close()
 sys.exit(0)
 """)
diff --git a/test/Rpcgen/RPCGENSERVICEFLAGS.py b/test/Rpcgen/RPCGENSERVICEFLAGS.py
index eee45053..9b8962f9 100644
--- a/test/Rpcgen/RPCGENSERVICEFLAGS.py
+++ b/test/Rpcgen/RPCGENSERVICEFLAGS.py
@@ -35,15 +35,14 @@ test = TestSCons.TestSCons()
 
 test.write('myrpcgen.py', """
 import getopt
-import string
 import sys
 cmd_opts, args = getopt.getopt(sys.argv[1:], 'chlmo:x', [])
 for opt, arg in cmd_opts:
     if opt == '-o': output = open(arg, 'wb')
-output.write(string.join(sys.argv) + "\\n")
+output.write(" ".join(sys.argv) + "\\n")
 for a in args:
     contents = open(a, 'rb').read()
-    output.write(string.replace(contents, 'RPCGEN', 'myrpcgen.py'))
+    output.write(contents.replace('RPCGEN', 'myrpcgen.py'))
 output.close()
 sys.exit(0)
 """)
diff --git a/test/Rpcgen/RPCGENXDRFLAGS.py b/test/Rpcgen/RPCGENXDRFLAGS.py
index c9a911ad..8f90d5a4 100644
--- a/test/Rpcgen/RPCGENXDRFLAGS.py
+++ b/test/Rpcgen/RPCGENXDRFLAGS.py
@@ -35,15 +35,14 @@ test = TestSCons.TestSCons()
 
 test.write('myrpcgen.py', """
 import getopt
-import string
 import sys
 cmd_opts, args = getopt.getopt(sys.argv[1:], 'chlmo:x', [])
 for opt, arg in cmd_opts:
     if opt == '-o': output = open(arg, 'wb')
-output.write(string.join(sys.argv) + "\\n")
+output.write(" ".join(sys.argv) + "\\n")
 for a in args:
     contents = open(a, 'rb').read()
-    output.write(string.replace(contents, 'RPCGEN', 'myrpcgen.py'))
+    output.write(contents.replace('RPCGEN', 'myrpcgen.py'))
 output.close()
 sys.exit(0)
 """)