From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 17 Oct 2009 06:33:05 +0000 (+0000)
Subject: Correctly restore sys.stdout in test_descr
X-Git-Tag: v2.7a1~332
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0447cd6fdc9b7d179c729fb43df55eeab8173dcc;p=python

Correctly restore sys.stdout in test_descr
---

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 00f19ce17b..0b21f57ce8 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4311,6 +4311,7 @@ order (MRO) for bases """
     def test_file_fault(self):
         # Testing sys.stdout is changed in getattr...
         import sys
+        test_stdout = sys.stdout
         class StdoutGuard:
             def __getattr__(self, attr):
                 sys.stdout = sys.__stdout__
@@ -4320,6 +4321,8 @@ order (MRO) for bases """
             print "Oops!"
         except RuntimeError:
             pass
+        finally:
+            sys.stdout = test_stdout
 
     def test_vicious_descriptor_nonsense(self):
         # Testing vicious_descriptor_nonsense...