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.

4 files changed, 4 insertions, 7 deletions

diff --git a/test/sconsign/ghost-entries.py b/test/sconsign/ghost-entries.py
index 2f8ee73e..46916ca3 100644
--- a/test/sconsign/ghost-entries.py
+++ b/test/sconsign/ghost-entries.py
@@ -89,7 +89,7 @@ test.run(arguments="-Q go case=2")
 
 test.write('SConstruct', """\
 Command("d/current.txt", [], [Touch("$TARGET")])
-if ARGUMENTS.has_key('pass') and ARGUMENTS['pass'] == '1':
+if 'pass' in ARGUMENTS and ARGUMENTS['pass'] == '1':
   Command("d/obsolete.txt", [], [Touch("$TARGET")])
 Command("installer.exe", ['d'], [Touch("$TARGET")])
 """)
diff --git a/test/sconsign/script/SConsignFile.py b/test/sconsign/script/SConsignFile.py
index e974c67c..fc658298 100644
--- a/test/sconsign/script/SConsignFile.py
+++ b/test/sconsign/script/SConsignFile.py
@@ -44,10 +44,9 @@ fake_link_py = test.workpath('fake_link.py')
 test.write(fake_cc_py, r"""#!/usr/bin/env python
 import os
 import re
-import string
 import sys
 
-path = string.split(sys.argv[1])
+path = sys.argv[1].split()
 output = open(sys.argv[2], 'wb')
 input = open(sys.argv[3], 'rb')
 
diff --git a/test/sconsign/script/Signatures.py b/test/sconsign/script/Signatures.py
index 5a7b5cfd..cfd2a7f9 100644
--- a/test/sconsign/script/Signatures.py
+++ b/test/sconsign/script/Signatures.py
@@ -63,10 +63,9 @@ fake_link_py = test.workpath('fake_link.py')
 test.write(fake_cc_py, r"""#!/usr/bin/env python
 import os
 import re
-import string
 import sys
 
-path = string.split(sys.argv[1])
+path = sys.argv[1].split()
 output = open(sys.argv[2], 'wb')
 input = open(sys.argv[3], 'rb')
 
diff --git a/test/sconsign/script/no-SConsignFile.py b/test/sconsign/script/no-SConsignFile.py
index 89243295..fe68f913 100644
--- a/test/sconsign/script/no-SConsignFile.py
+++ b/test/sconsign/script/no-SConsignFile.py
@@ -52,10 +52,9 @@ fake_link_py = test.workpath('fake_link.py')
 test.write(fake_cc_py, r"""#!/usr/bin/env python
 import os
 import re
-import string
 import sys
 
-path = string.split(sys.argv[1])
+path = sys.argv[1].split()
 output = open(sys.argv[2], 'wb')
 input = open(sys.argv[3], 'rb')