diff options
| author | Brett Cannon <bcannon@gmail.com> | 2008-09-09 01:52:27 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2008-09-09 01:52:27 (GMT) |
| commit | 1cd0247a4d1b8282631707ba06b514aeddc75782 (patch) | |
| tree | 631d7f5670241d765d0aff8f9f4ef6045286badb /Lib/test/test___all__.py | |
| parent | 4c19e6e02d4d7bb6d92395276dbf801e12876e24 (diff) | |
| download | cpython-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___all__.py')
| -rw-r--r-- | Lib/test/test___all__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py index ba8f75b..052cc20 100644 --- a/Lib/test/test___all__.py +++ b/Lib/test/test___all__.py @@ -1,5 +1,5 @@ import unittest -from test.support import run_unittest, catch_warning +from test.support import run_unittest import sys import warnings @@ -8,7 +8,7 @@ class AllTest(unittest.TestCase): def check_all(self, modname): names = {} - with catch_warning(): + with warnings.catch_warnings(): warnings.filterwarnings("ignore", ".* (module|package)", DeprecationWarning) try: |