mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 19:34:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge 3.6

Browse source
This commit is contained in:
Victor Stinner 2016-12-06 11:02:54 +01:00
commit b38e83df33
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_warnings/__init__.py
View file

@ -945,7 +945,7 @@ class CatchWarningTests(BaseTest):
self.assertTrue(wmod.filters is orig_filters) self.assertTrue(wmod.filters is orig_filters)
def test_record_override_showwarning_before(self): 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. # that catch_warnings(record=True) overrides it again.
text = "This is a warning" text = "This is a warning"
wmod = self.module wmod = self.module
@ -970,7 +970,7 @@ class CatchWarningTests(BaseTest):
self.assertEqual(my_log, []) self.assertEqual(my_log, [])
def test_record_override_showwarning_inside(self): 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. # in the catch_warnings(record=True) context manager.
text = "This is a warning" text = "This is a warning"
wmod = self.module wmod = self.module

2
Misc/NEWS
View file

@ -165,7 +165,7 @@ Core and Builtins
Library 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. call warnings.showwarning() if it was overriden inside the context manager.
- Issue #27172: To assist with upgrades from 2.7, the previously documented - Issue #27172: To assist with upgrades from 2.7, the previously documented