Issue #3781: Final cleanup of warnings.catch_warnings and its usage in the test suite. Closes issue w.r.t. 2.6 (R: Brett Cannon)
diff --git a/Lib/test/test_symtable.py b/Lib/test/test_symtable.py
index b20f2b4..f1fa18a 100644
--- a/Lib/test/test_symtable.py
+++ b/Lib/test/test_symtable.py
@@ -60,16 +60,16 @@
def check(w, msg):
self.assertEqual(str(w.message), msg)
sym = self.top.lookup("glob")
- with warnings.catch_warnings(record=True) as w:
+ with test_support.check_warnings() as w:
warnings.simplefilter("always", DeprecationWarning)
self.assertFalse(sym.is_vararg())
- check(w[-1].message, "is_vararg() is obsolete and will be removed")
+ check(w, "is_vararg() is obsolete and will be removed")
+ w.reset()
self.assertFalse(sym.is_keywordarg())
- check(w[-1].message,
- "is_keywordarg() is obsolete and will be removed")
+ check(w, "is_keywordarg() is obsolete and will be removed")
+ w.reset()
self.assertFalse(sym.is_in_tuple())
- check(w[-1].message,
- "is_in_tuple() is obsolete and will be removed")
+ check(w, "is_in_tuple() is obsolete and will be removed")
def test_type(self):
self.assertEqual(self.top.get_type(), "module")