diff options
| author | Brett Cannon <bcannon@gmail.com> | 2008-09-09 01:52:27 +0000 |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2008-09-09 01:52:27 +0000 |
| commit | 1cd0247a4d1b8282631707ba06b514aeddc75782 (patch) | |
| tree | 631d7f5670241d765d0aff8f9f4ef6045286badb /Lib/test/test_struct.py | |
| parent | 4c19e6e02d4d7bb6d92395276dbf801e12876e24 (diff) | |
| download | cpython-git-1cd0247a4d1b8282631707ba06b514aeddc75782.tar.gz | |
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_struct.py')
| -rw-r--r-- | Lib/test/test_struct.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index 6dc0e8dc05..00219b8ca0 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -4,7 +4,7 @@ import struct 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 bigendian_to_native(value): 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") |