[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6
victor.stinner
python-checkins at python.org
Tue Dec 6 05:03:13 EST 2016
https://hg.python.org/cpython/rev/9db231dd0b73
changeset: 105477:9db231dd0b73
parent: 105475:2bd1717b6e00
parent: 105476:150d36dbe3ba
user: Victor Stinner <victor.stinner at gmail.com>
date: Tue Dec 06 11:02:54 2016 +0100
summary:
Merge 3.6
files:
Lib/test/test_warnings/__init__.py | 4 ++--
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
--- a/Lib/test/test_warnings/__init__.py
+++ b/Lib/test/test_warnings/__init__.py
@@ -945,7 +945,7 @@
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 @@
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
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -165,7 +165,7 @@
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
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list