summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_hmac.py
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-09-09 01:52:27 (GMT)
committerBrett Cannon <bcannon@gmail.com>2008-09-09 01:52:27 (GMT)
commit1cd0247a4d1b8282631707ba06b514aeddc75782 (patch)
tree631d7f5670241d765d0aff8f9f4ef6045286badb /Lib/test/test_hmac.py
parent4c19e6e02d4d7bb6d92395276dbf801e12876e24 (diff)
downloadcpython-1cd0247a4d1b8282631707ba06b514aeddc75782.zip
cpython-1cd0247a4d1b8282631707ba06b514aeddc75782.tar.gz
cpython-1cd0247a4d1b8282631707ba06b514aeddc75782.tar.bz2
Merged revisions 66321 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r66321 | brett.cannon | 2008-09-08 17:49:16 -0700 (Mon, 08 Sep 2008) | 7 lines warnings.catch_warnings() now returns a list or None instead of the custom WarningsRecorder object. This makes the API simpler to use as no special object must be learned. Closes issue 3781. Review by Benjamin Peterson. ........
Diffstat (limited to 'Lib/test/test_hmac.py')
-rw-r--r--Lib/test/test_hmac.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_hmac.py b/Lib/test/test_hmac.py
index 43953cf..f7ac8ef 100644
--- a/Lib/test/test_hmac.py
+++ b/Lib/test/test_hmac.py
@@ -211,7 +211,7 @@ class TestVectorsTestCase(unittest.TestCase):
def digest(self):
return self._x.digest()
- with support.catch_warning():
+ with warnings.catch_warnings():
warnings.simplefilter('error', RuntimeWarning)
try:
hmac.HMAC(b'a', b'b', digestmod=MockCrazyHash)