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_import.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_import.py')
| -rw-r--r-- | Lib/test/test_import.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py index aa65c7a419..0dbbbf04c5 100644 --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -6,7 +6,7 @@ import sys import py_compile import warnings import imp -from test.support import unlink, TESTFN, unload, run_unittest, catch_warning +from test.support import unlink, TESTFN, unload, run_unittest def remove_files(name): @@ -153,7 +153,7 @@ class ImportTest(unittest.TestCase): self.assert_(y is test.support, y.__name__) def test_import_initless_directory_warning(self): - with catch_warning(): + with warnings.catch_warnings(): # Just a random non-package directory we always expect to be # somewhere in sys.path... warnings.simplefilter('error', ImportWarning) |