mirror of
https://github.com/python/cpython.git
synced 2025-07-28 21:55:21 +00:00
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:
parent
631be01252
commit
672237dc6c
24 changed files with 268 additions and 253 deletions
|
@ -18,7 +18,7 @@ __all__ = ["Error", "TestFailed", "TestSkipped", "ResourceDenied", "import_modul
|
|||
"is_resource_enabled", "requires", "find_unused_port", "bind_port",
|
||||
"fcmp", "have_unicode", "is_jython", "TESTFN", "HOST", "FUZZ",
|
||||
"findfile", "verify", "vereq", "sortdict", "check_syntax_error",
|
||||
"open_urlresource", "catch_warning", "CleanImport",
|
||||
"open_urlresource", "CleanImport",
|
||||
"EnvironmentVarGuard", "captured_output",
|
||||
"captured_stdout", "TransientResource", "transient_internet",
|
||||
"run_with_locale", "set_memlimit", "bigmemtest", "bigaddrspacetest",
|
||||
|
@ -52,7 +52,7 @@ class ResourceDenied(TestSkipped):
|
|||
def import_module(name, deprecated=False):
|
||||
"""Import the module to be tested, raising TestSkipped if it is not
|
||||
available."""
|
||||
with catch_warning(record=False):
|
||||
with warnings.catch_warnings():
|
||||
if deprecated:
|
||||
warnings.filterwarnings("ignore", ".+ (module|package)",
|
||||
DeprecationWarning)
|
||||
|
@ -381,10 +381,6 @@ def open_urlresource(url):
|
|||
return open(fn)
|
||||
|
||||
|
||||
def catch_warning(module=warnings, record=True):
|
||||
return warnings.catch_warnings(record=record, module=module)
|
||||
|
||||
|
||||
class CleanImport(object):
|
||||
"""Context manager to force import to return a new module reference.
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue