[Python-checkins] r76043 - in python/branches/py3k: Lib/distutils/tests/test_build_py.py Lib/distutils/tests/test_util.py
tarek.ziade
python-checkins at python.org
Sun Nov 1 23:38:44 CET 2009
Author: tarek.ziade
Date: Sun Nov 1 23:38:44 2009
New Revision: 76043
Log:
Merged revisions 76042 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76042 | tarek.ziade | 2009-11-01 23:33:45 +0100 (Sun, 01 Nov 2009) | 1 line
fixed stdout alteration in test_distutils
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/distutils/tests/test_build_py.py
python/branches/py3k/Lib/distutils/tests/test_util.py
Modified: python/branches/py3k/Lib/distutils/tests/test_build_py.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_build_py.py (original)
+++ python/branches/py3k/Lib/distutils/tests/test_build_py.py Sun Nov 1 23:38:44 2009
@@ -69,6 +69,7 @@
open(os.path.join(testdir, "testfile"), "w").close()
os.chdir(sources)
+ old_stdout = sys.stdout
sys.stdout = io.StringIO()
try:
@@ -87,7 +88,7 @@
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
Modified: python/branches/py3k/Lib/distutils/tests/test_util.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_util.py (original)
+++ python/branches/py3k/Lib/distutils/tests/test_util.py Sun Nov 1 23:38:44 2009
@@ -60,6 +60,8 @@
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 @@
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):
More information about the Python-checkins
mailing list