From ce3d22144781845784d17fa3b4b3e034d2d448f0 Mon Sep 17 00:00:00 2001
From: Brett Cannon <bcannon@gmail.com>
Date: Wed, 1 Apr 2009 20:25:48 +0000
Subject: [PATCH] test_warnings ironically had a single test that was not
 protecting the warnings filter and was resetting it.

---
 Lib/test/test_warnings.py | 16 ++++++++--------
 Misc/NEWS                 |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py
index bc177ad9e7c..bb2fb5ff250 100644
--- a/Lib/test/test_warnings.py
+++ b/Lib/test/test_warnings.py
@@ -460,14 +460,14 @@ class _WarningsTests(BaseTest):
         self.failUnless(text in result)
 
     def test_showwarning_not_callable(self):
-        self.module.filterwarnings("always", category=UserWarning)
-        old_showwarning = self.module.showwarning
-        self.module.showwarning = 23
-        try:
-            self.assertRaises(TypeError, self.module.warn, "Warning!")
-        finally:
-            self.module.showwarning = old_showwarning
-            self.module.resetwarnings()
+        with original_warnings.catch_warnings(module=self.module):
+            self.module.filterwarnings("always", category=UserWarning)
+            old_showwarning = self.module.showwarning
+            self.module.showwarning = 23
+            try:
+                self.assertRaises(TypeError, self.module.warn, "Warning!")
+            finally:
+                self.module.showwarning = old_showwarning
 
     def test_show_warning_output(self):
         # With showarning() missing, make sure that output is okay.
diff --git a/Misc/NEWS b/Misc/NEWS
index c4474522fbe..08552bf3145 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -730,6 +730,8 @@ Extension Modules
 Tests
 -----
 
+- Fix test_warnings to no longer reset the warnings filter.
+
 - Fix test_logging to no longer reset the warnings filter.
 
 - Issue #5635: Fix running test_sys with tracing enabled.