summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-11-01 23:17:51 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-11-01 23:17:51 (GMT)
commit1d520c192170572c077879a845ecb8fd819fd8b7 (patch)
tree2eeab8112fe691bfac490b3ce28945223c9a848b
parentd6cfb8e0f897c237600859f7c46315c47e42a18b (diff)
downloadcpython-1d520c192170572c077879a845ecb8fd819fd8b7.zip
cpython-1d520c192170572c077879a845ecb8fd819fd8b7.tar.gz
cpython-1d520c192170572c077879a845ecb8fd819fd8b7.tar.bz2
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 ........
-rw-r--r--Lib/distutils/tests/test_build_py.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/distutils/tests/test_build_py.py b/Lib/distutils/tests/test_build_py.py
index 54a4ed8..4b04547 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_suite():
return unittest.makeSuite(BuildPyTestCase)