6 files changed, 17 insertions, 153 deletions
diff --git a/test/TEX/bibliography.py b/test/TEX/bibliography.py
index 5e26f6e..c26b010 100644
--- a/test/TEX/bibliography.py
+++ b/test/TEX/bibliography.py
@@ -118,9 +118,6 @@ test.must_not_exist(test.workpath('simple.blg'))
 test.pass_test()
 
 
-
-# FUTURE:  
-
 test.write('SConstruct', """\
 env = Environment(tools = ['tex', 'latex', 'dvips'])
 env.PostScript('d00', 'd00.tex')
diff --git a/test/compat/all.py b/test/compat/all.py
deleted file mode 100644
index ac7a6ea..0000000
--- a/test/compat/all.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-"""
-Verify that we can use the any() function (in any supported Python
-version we happen to be testing).
-
-This test can be retired at some point in the distant future when Python
-2.5 becomes the minimum version supported by SCons.
-"""
-
-import TestSCons
-
-test = TestSCons.TestSCons()
-
-test.write('SConstruct', """\
-print all([True, 1]) and "YES" or "NO"
-print all([0]) and "YES" or "NO"
-SConscript('SConscript')
-""")
-
-test.write('SConscript', """\
-print all([1, False]) and "YES" or "NO"
-print all([True, None]) and "YES" or "NO"
-""")
-
-expect = """\
-YES
-NO
-NO
-NO
-"""
-
-test.run(arguments = '-Q -q', stdout = expect)
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/compat/any.py b/test/compat/any.py
deleted file mode 100644
index 3c03807..0000000
--- a/test/compat/any.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-#
-# __COPYRIGHT__
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-"""
-Verify that we can use the any() function (in any supported Python
-version we happen to be testing).
-
-This test can be retired at some point in the distant future when Python
-2.5 becomes the minimum version supported by SCons.
-"""
-
-import TestSCons
-
-test = TestSCons.TestSCons()
-
-test.write('SConstruct', """\
-print any([True, False]) and "YES" or "NO"
-print any([1]) and "YES" or "NO"
-SConscript('SConscript')
-""")
-
-test.write('SConscript', """\
-print any([0, False]) and "YES" or "NO"
-""")
-
-expect = """\
-YES
-YES
-NO
-"""
-
-test.run(arguments = '-Q -q', stdout = expect)
-
-test.pass_test()
-
-# Local Variables:
-# tab-width:4
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/test/option/profile.py b/test/option/profile.py
index d53c690..4d6caae 100644
--- a/test/option/profile.py
+++ b/test/option/profile.py
@@ -24,19 +24,14 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import sys
-try:
-    import io
-    _StringIO = io.StringIO
-except (ImportError, AttributeError):
-    # Pre-2.6 Python has no "io" module.
-    exec('from cStringIO import StringIO')
-else:
-    # TODO(2.6):  In 2.6 and beyond, the io.StringIO.write() method
-    # requires unicode strings.  This subclass can probably be removed
-    # when we drop support for Python 2.6.
-    class StringIO(_StringIO):
-        def write(self, s):
-            _StringIO.write(self, unicode(s))
+import io
+_StringIO = io.StringIO
+# TODO(2.6):  In 2.6 and beyond, the io.StringIO.write() method
+# requires unicode strings.  This subclass can probably be removed
+# when we drop support for Python 2.6.
+class StringIO(_StringIO):
+    def write(self, s):
+        _StringIO.write(self, unicode(s))
 
 import TestSCons
 
diff --git a/test/sconsign/script/bad.py b/test/sconsign/script/bad.py
index fc21577..a384748 100644
--- a/test/sconsign/script/bad.py
+++ b/test/sconsign/script/bad.py
@@ -47,16 +47,16 @@ test.run_sconsign(arguments = "-f dblite bad1.dblite",
          stderr = "sconsign: \[Errno 2\] No such file or directory: 'bad1.dblite'\n")
 
 test.run_sconsign(arguments = "-f dblite bad2",
-         stderr = "sconsign: ignoring invalid `dblite' file `bad2'\n")
+         stderr = "sconsign: ignoring invalid `dblite' file `bad2'.*\n")
 
 test.run_sconsign(arguments = "-f dblite bad2.dblite",
-         stderr = "sconsign: ignoring invalid `dblite' file `bad2.dblite'\n")
+         stderr = "sconsign: ignoring invalid `dblite' file `bad2.dblite'.*\n")
 
 test.run_sconsign(arguments = "-f sconsign no_sconsign",
          stderr = "sconsign: \[Errno 2\] No such file or directory: 'no_sconsign'\n")
 
 test.run_sconsign(arguments = "-f sconsign bad3",
-         stderr = "sconsign: ignoring invalid .sconsign file `bad3'\n")
+         stderr = "sconsign: ignoring invalid .sconsign file `bad3'.*\n")
 
 test.pass_test()
 
diff --git a/test/update-release-info/update-release-info.py b/test/update-release-info/update-release-info.py
index e44aa99..970bcce 100644
--- a/test/update-release-info/update-release-info.py
+++ b/test/update-release-info/update-release-info.py
@@ -60,10 +60,10 @@ combo_strings = [
 """version_tuple = (2, 0, 0, 'bad', 0)
 """,
 # Index 1: Python version tuple
-"""unsupported_python_version = (2, 3)
+"""unsupported_python_version = (2, 6)
 """,
 # Index 2: Python version tuple
-"""deprecated_python_version  = (2, 4)
+"""deprecated_python_version  = (2, 7)
 """,
 # Index 3: alpha version tuple
 """version_tuple = (2, 0, 0, 'alpha', 0)
@@ -223,14 +223,14 @@ These files are a part of 33.22.11:
 test.must_match(TestSCons, """
 copyright_years = '%s'
 default_version = '2.0.0.alpha.yyyymmdd'
-python_version_unsupported = (2, 3)
-python_version_deprecated = (2, 4)
+python_version_unsupported = (2, 6)
+python_version_deprecated = (2, 7)
 """%years, mode = 'r')
 
 # should get Python floors from TestSCons module.
 test.must_match(Main, """
-unsupported_python_version = (2, 3)
-deprecated_python_version = (2, 4)
+unsupported_python_version = (2, 6)
+deprecated_python_version = (2, 7)
 """, mode = 'r')
 
 #TODO: Release option