diff Lib/test/test_struct.py @ 49100:3e6e565ee30a

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. ........
author Brett Cannon <bcannon@gmail.com>
date Tue, 09 Sep 2008 01:52:27 +0000
parents b5cf0cb0c7ce
children fb905890d049
line wrap: on
line diff
--- a/Lib/test/test_struct.py	Mon Sep 08 23:41:21 2008 +0000
+++ b/Lib/test/test_struct.py	Tue Sep 09 01:52:27 2008 +0000
@@ -4,7 +4,7 @@
 import warnings
 
 from functools import wraps
-from test.support import TestFailed, verbose, run_unittest, catch_warning
+from test.support import TestFailed, verbose, run_unittest
 
 import sys
 ISBIGENDIAN = sys.byteorder == "big"
@@ -34,7 +34,7 @@
 def with_warning_restore(func):
     @wraps(func)
     def decorator(*args, **kw):
-        with catch_warning():
+        with warnings.catch_warnings():
             # We need this function to warn every time, so stick an
             # unqualifed 'always' at the head of the filter list
             warnings.simplefilter("always")