commit 6257a7bbb2660ae75c44f2e71d7ac2ce73900f74
author Florent Xicluna <florent.xicluna@gmail.com> Wed Mar 31 22:01:03 2010 +0000
committer Florent Xicluna <florent.xicluna@gmail.com> Wed Mar 31 22:01:03 2010 +0000
tree 6f010065c95f2d5617f56e07ba2628be21cf9d7a
parent ad5983364966b49c277b495112ae41c6ae2d01ed

Replace catch_warnings with check_warnings when it makes sense.  Use assertRaises context manager to simplify some tests.

Lib/test/test_hmac.py

diff --git a/Lib/test/test_hmac.py b/Lib/test/test_hmac.py
index 30bb4fe..cd148e9 100644
--- a/Lib/test/test_hmac.py
+++ b/Lib/test/test_hmac.py
@@ -213,19 +213,13 @@
 
         with warnings.catch_warnings():
             warnings.simplefilter('error', RuntimeWarning)
-            try:
+            with self.assertRaises(RuntimeWarning):
                 hmac.HMAC('a', 'b', digestmod=MockCrazyHash)
-            except RuntimeWarning:
-                pass
-            else:
                 self.fail('Expected warning about missing block_size')
 
             MockCrazyHash.block_size = 1
-            try:
+            with self.assertRaises(RuntimeWarning):
                 hmac.HMAC('a', 'b', digestmod=MockCrazyHash)
-            except RuntimeWarning:
-                pass
-            else:
                 self.fail('Expected warning about small block_size')