diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-12-06 11:02:54 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-12-06 11:02:54 +0100 |
| commit | b38e83df332e786fe9f0080aa158555cdf1a93c0 (patch) | |
| tree | 74e91049674ae23cfc1fe9e6265a3d13b0ad776e | |
| parent | 01928f6c0f8f008fd5c8ab4cc445113b0cbd0292 (diff) | |
| parent | 8ae9e6a627ed6630b577a540d611c226959280ce (diff) | |
| download | cpython-git-b38e83df332e786fe9f0080aa158555cdf1a93c0.tar.gz | |
Merge 3.6
| -rw-r--r-- | Lib/test/test_warnings/__init__.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_warnings/__init__.py b/Lib/test/test_warnings/__init__.py index 60fa780633..0cddf4a2f4 100644 --- a/Lib/test/test_warnings/__init__.py +++ b/Lib/test/test_warnings/__init__.py @@ -945,7 +945,7 @@ class CatchWarningTests(BaseTest): self.assertTrue(wmod.filters is orig_filters) def test_record_override_showwarning_before(self): - # Issue #28089: If warnings.showwarning() was overriden, make sure + # Issue #28835: If warnings.showwarning() was overriden, make sure # that catch_warnings(record=True) overrides it again. text = "This is a warning" wmod = self.module @@ -970,7 +970,7 @@ class CatchWarningTests(BaseTest): self.assertEqual(my_log, []) def test_record_override_showwarning_inside(self): - # Issue #28089: It is possible to override warnings.showwarning() + # Issue #28835: It is possible to override warnings.showwarning() # in the catch_warnings(record=True) context manager. text = "This is a warning" wmod = self.module @@ -165,7 +165,7 @@ Core and Builtins Library ------- -- Issue #28089: Fix a regression introduced in warnings.catch_warnings(): +- Issue #28835: Fix a regression introduced in warnings.catch_warnings(): call warnings.showwarning() if it was overriden inside the context manager. - Issue #27172: To assist with upgrades from 2.7, the previously documented |