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_structmembers.py b/Lib/test/test_structmembers.py
index e0e7e56..c196cc5 100644
--- a/Lib/test/test_structmembers.py
+++ b/Lib/test/test_structmembers.py
@@ -66,35 +66,35 @@
class TestWarnings(unittest.TestCase):
def has_warned(self, w):
- self.assertEqual(w[-1].category, RuntimeWarning)
+ self.assertEqual(w.category, RuntimeWarning)
def test_byte_max(self):
- with warnings.catch_warnings(record=True) as w:
+ with test_support.check_warnings() as w:
ts.T_BYTE = CHAR_MAX+1
self.has_warned(w)
def test_byte_min(self):
- with warnings.catch_warnings(record=True) as w:
+ with test_support.check_warnings() as w:
ts.T_BYTE = CHAR_MIN-1
self.has_warned(w)
def test_ubyte_max(self):
- with warnings.catch_warnings(record=True) as w:
+ with test_support.check_warnings() as w:
ts.T_UBYTE = UCHAR_MAX+1
self.has_warned(w)
def test_short_max(self):
- with warnings.catch_warnings(record=True) as w:
+ with test_support.check_warnings() as w:
ts.T_SHORT = SHRT_MAX+1
self.has_warned(w)
def test_short_min(self):
- with warnings.catch_warnings(record=True) as w:
+ with test_support.check_warnings() as w:
ts.T_SHORT = SHRT_MIN-1
self.has_warned(w)
def test_ushort_max(self):
- with warnings.catch_warnings(record=True) as w:
+ with test_support.check_warnings() as w:
ts.T_USHORT = USHRT_MAX+1
self.has_warned(w)