mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 66321 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Brett Cannon 2008-09-09 01:52:27 +00:00
parent 4c19e6e02d
commit 1cd0247a4d
10 changed files with 193 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_import.py
View file

@ -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)