Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Make test.test_support.catch_warning() take an argument specifying if any 

triggered warnings should be captured. This allows the context manager to be
used to just prevent the internal state of the 'warnings' framework and thus
allow triggered warnings to be displayed.
This commit is contained in:
Brett Cannon 2008-05-08 19:50:51 +00:00
parent 9d44182427
commit bfb997d6a5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/test_support.py
View File

@ -40,7 +40,7 @@ class ResourceDenied(TestSkipped):
def import_module(name, deprecated=False): def import_module(name, deprecated=False):
"""Import the module to be tested, raising TestSkipped if it is not """Import the module to be tested, raising TestSkipped if it is not
available.""" available."""
with catch_warning(): with catch_warning(record=False):
if deprecated: if deprecated:
warnings.filterwarnings("ignore", ".+ module", DeprecationWarning) warnings.filterwarnings("ignore", ".+ module", DeprecationWarning)
try: try:
@ -395,7 +395,7 @@ class WarningMessage(object):
@contextlib.contextmanager @contextlib.contextmanager
def catch_warning(module=warnings): def catch_warning(module=warnings, record=True):
""" """
Guard the warnings filter from being permanently changed and record the Guard the warnings filter from being permanently changed and record the
data of the last warning that has been issued. data of the last warning that has been issued.
@ -406,12 +406,13 @@ def catch_warning(module=warnings):
warnings.warn("foo") warnings.warn("foo")
assert str(w.message) == "foo" assert str(w.message) == "foo"
""" """
warning_obj = WarningMessage() if record:
warning_obj = WarningMessage()
module.showwarning = warning_obj._showwarning
original_filters = module.filters[:] original_filters = module.filters[:]
original_showwarning = module.showwarning original_showwarning = module.showwarning
module.showwarning = warning_obj._showwarning
try: try:
yield warning_obj yield warning_obj if record else None
finally: finally:
module.showwarning = original_showwarning module.showwarning = original_showwarning
module.filters = original_filters module.filters = original_filters