From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Sun, 1 Nov 2009 23:17:51 +0000 (+0000)
Subject: Merged revisions 76042 via svnmerge from
X-Git-Tag: v2.6.5rc1~390
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d520c192170572c077879a845ecb8fd819fd8b7;p=thirdparty%2FPython%2Fcpython.git

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
........
---

diff --git a/Lib/distutils/tests/test_build_py.py b/Lib/distutils/tests/test_build_py.py
index 54a4ed80fd30..4b045474f1c7 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)