From 9c48da74bc2e9f9bd20b1132934d926cec370036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= Date: Sun, 1 Nov 2009 22:33:45 +0000 Subject: fixed stdout alteration in test_distutils --- Lib/distutils/tests/test_build_py.py | 3 ++- Lib/distutils/tests/test_util.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/distutils/tests/test_build_py.py b/Lib/distutils/tests/test_build_py.py index bfe6154..472591d 100644 --- a/Lib/distutils/tests/test_build_py.py +++ b/Lib/distutils/tests/test_build_py.py @@ -69,6 +69,7 @@ class BuildPyTestCase(support.TempdirManager, open(os.path.join(testdir, "testfile"), "w").close() os.chdir(sources) + old_stdout = sys.stdout sys.stdout = StringIO.StringIO() try: @@ -87,7 +88,7 @@ class BuildPyTestCase(support.TempdirManager, finally: # Restore state. os.chdir(cwd) - sys.stdout = sys.__stdout__ + sys.stdout = old_stdout def test_dont_write_bytecode(self): # makes sure byte_compile is not used diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py index 55ef160..6722997 100644 --- a/Lib/distutils/tests/test_util.py +++ b/Lib/distutils/tests/test_util.py @@ -60,6 +60,8 @@ class UtilTestCase(support.EnvironGuard, unittest.TestCase): util.find_executable = self._find_executable self._exes = {} self.old_popen = subprocess.Popen + self.old_stdout = sys.stdout + self.old_stderr = sys.stderr FakePopen.test_class = self subprocess.Popen = FakePopen @@ -79,6 +81,8 @@ class UtilTestCase(support.EnvironGuard, unittest.TestCase): sysconfig._config_vars = copy(self._config_vars) util.find_executable = self.old_find_executable subprocess.Popen = self.old_popen + sys.old_stdout = self.old_stdout + sys.old_stderr = self.old_stderr super(UtilTestCase, self).tearDown() def _set_uname(self, uname): -- cgit v0.12