commit 7195963aa2b25030ef4662e6879ad27517e63fcc
author Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> Mon Apr 27 01:44:28 2009 +0000
committer Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> Mon Apr 27 01:44:28 2009 +0000
tree 7e4afe7f95e9f29995900790297d9ee41ca7f8be
parent 5afb5c6630540f2b4fb314a9a7c5ea9692e0b0c0

test_support was renamed to support on py3k.

Lib/test/test_optparse.py

diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py
index 5cf77e4..e4ede4a 100644
--- a/Lib/test/test_optparse.py
+++ b/Lib/test/test_optparse.py
@@ -1448,7 +1448,7 @@
         # we must restore its original value -- otherwise, this test
         # screws things up for other tests when it's part of the Python
         # test suite.
-        with test_support.EnvironmentVarGuard() as env:
+        with support.EnvironmentVarGuard() as env:
             env.set('COLUMNS', str(columns))
             return InterceptingOptionParser(option_list=options)
 
@@ -1473,7 +1473,7 @@
         self.assertHelpEquals(_expected_help_long_opts_first)
 
     def test_help_title_formatter(self):
-        with test_support.EnvironmentVarGuard() as env:
+        with support.EnvironmentVarGuard() as env:
             env.set("COLUMNS", "80")
             self.parser.formatter = TitledHelpFormatter()
             self.assertHelpEquals(_expected_help_title_formatter)

Lib/test/test_posixpath.py

diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 17be3d2..a37be25 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -419,7 +419,7 @@
             self.assert_(isinstance(posixpath.expanduser(b"~root/"), bytes))
             self.assert_(isinstance(posixpath.expanduser(b"~foo/"), bytes))
 
-            with test_support.EnvironmentVarGuard() as env:
+            with support.EnvironmentVarGuard() as env:
                 env.set('HOME', '/')
                 self.assertEqual(posixpath.expanduser("~"), "/")
 

Lib/test/test_tempfile.py

diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index 844e608..11674a6 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -149,7 +149,7 @@
         # _candidate_tempdir_list contains the expected directories
 
         # Make sure the interesting environment variables are all set.
-        with test_support.EnvironmentVarGuard() as env:
+        with support.EnvironmentVarGuard() as env:
             for envname in 'TMPDIR', 'TEMP', 'TMP':
                 dirname = os.getenv(envname)
                 if not dirname: