From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Mon, 27 Apr 2009 01:44:28 +0000 (+0000)
Subject: test_support was renamed to support on py3k.
X-Git-Tag: v3.1b1~164
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7195963aa2b25030ef4662e6879ad27517e63fcc;p=thirdparty%2FPython%2Fcpython.git

test_support was renamed to support on py3k.
---

diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py
index 5cf77e4af3f4..e4ede4a2b39b 100644
--- a/Lib/test/test_optparse.py
+++ b/Lib/test/test_optparse.py
@@ -1448,7 +1448,7 @@ class TestHelp(BaseTest):
         # 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 @@ class TestHelp(BaseTest):
         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)
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 17be3d2c63e1..a37be2530a33 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -419,7 +419,7 @@ class PosixPathTest(unittest.TestCase):
             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("~"), "/")
 
diff --git a/Lib/test/test_tempfile.py b/Lib/test/test_tempfile.py
index 844e608a6ff9..11674a62fb13 100644
--- a/Lib/test/test_tempfile.py
+++ b/Lib/test/test_tempfile.py
@@ -149,7 +149,7 @@ class test__candidate_tempdir_list(TC):
         # _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: