From: Skip Montanaro <skip@pobox.com>
Date: Tue, 7 Oct 2008 15:04:16 +0000 (+0000)
Subject: backport
X-Git-Tag: v2.6.1~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=001befaadcf562170039e085ebd4ae3318f322c2;p=thirdparty%2FPython%2Fcpython.git

backport
---

diff --git a/Lib/test/test_atexit.py b/Lib/test/test_atexit.py
index 3c6043d10c98..0ff6e53bdc5d 100644
--- a/Lib/test/test_atexit.py
+++ b/Lib/test/test_atexit.py
@@ -7,13 +7,15 @@ from test import test_support
 class TestCase(unittest.TestCase):
     def setUp(self):
         s = StringIO.StringIO()
+        self.save_stdout = sys.stdout
+        self.save_stderr = sys.stderr
         sys.stdout = sys.stderr = self.subst_io = s
         self.save_handlers = atexit._exithandlers
         atexit._exithandlers = []
 
     def tearDown(self):
-        sys.stdout = sys.__stdout__
-        sys.stderr = sys.__stderr__
+        sys.stdout = self.save_stdout
+        sys.stderr = self.save_stderr
         atexit._exithandlers = self.save_handlers
 
     def test_args(self):