From: Greg Ward <gward@python.net>
Date: Mon, 7 Mar 2005 01:10:33 +0000 (+0000)
Subject: Ensure that warnings.filters is properly restored after fiddling with it
X-Git-Tag: v2.4.1c1~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=605db0d8c5e25bbfe205baa3210f0dc73825ffa9;p=thirdparty%2FPython%2Fcpython.git

Ensure that warnings.filters is properly restored after fiddling with it
(this was breaking test_warnings).
---

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 4af59b000da8..1601e4d8f341 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -3973,15 +3973,18 @@ def test_init():
         def __init__(self):
             return 10
 
-    oldfilters = warnings.filters
-    warnings.filterwarnings("error", category=RuntimeWarning)
+    oldfilters = warnings.filters[:]
     try:
-        Foo()
-    except RuntimeWarning:
         pass
-    else:
-        raise TestFailed, "did not test __init__() for None return"
-    warnings.filters = oldfilters
+        warnings.filterwarnings("error", category=RuntimeWarning)
+        try:
+            Foo()
+        except RuntimeWarning:
+            pass
+        else:
+            raise TestFailed, "did not test __init__() for None return"
+    finally:
+        warnings.filters = oldfilters
 
 
 def test_main():