mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Issue #26136: Upgrade the generator_stop warning to DeprecationWarning

Browse source 
Patch by Anish Shah.
This commit is contained in:
Martin Panter 2016-02-10 04:40:48 +00:00
parent b0cb42dfdb
commit 7e3a91a5fc
6 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_contextlib.py
View file

@ -89,7 +89,7 @@ class ContextManagerTestCase(unittest.TestCase):
def woohoo():
yield
try:
with self.assertWarnsRegex(PendingDeprecationWarning,
with self.assertWarnsRegex(DeprecationWarning,
"StopIteration"):
with woohoo():
raise stop_exc

6
Lib/test/test_generators.py
View file

@ -245,11 +245,11 @@ class ExceptionTest(unittest.TestCase):
yield
with self.assertRaises(StopIteration), \
self.assertWarnsRegex(PendingDeprecationWarning, "StopIteration"):
self.assertWarnsRegex(DeprecationWarning, "StopIteration"):
next(gen())
with self.assertRaisesRegex(PendingDeprecationWarning,
with self.assertRaisesRegex(DeprecationWarning,
"generator .* raised StopIteration"), \
warnings.catch_warnings():
@ -268,7 +268,7 @@ class ExceptionTest(unittest.TestCase):
g = f()
self.assertEqual(next(g), 1)
with self.assertWarnsRegex(PendingDeprecationWarning, "StopIteration"):
with self.assertWarnsRegex(DeprecationWarning, "StopIteration"):
with self.assertRaises(StopIteration):
next(g)

4
Lib/test/test_with.py
View file

@ -454,7 +454,7 @@ class ExceptionalTestCase(ContextmanagerAssertionMixin, unittest.TestCase):
with cm():
raise StopIteration("from with")
with self.assertWarnsRegex(PendingDeprecationWarning, "StopIteration"):
with self.assertWarnsRegex(DeprecationWarning, "StopIteration"):
self.assertRaises(StopIteration, shouldThrow)
def testRaisedStopIteration2(self):
@ -482,7 +482,7 @@ class ExceptionalTestCase(ContextmanagerAssertionMixin, unittest.TestCase):
with cm():
raise next(iter([]))
with self.assertWarnsRegex(PendingDeprecationWarning, "StopIteration"):
with self.assertWarnsRegex(DeprecationWarning, "StopIteration"):
self.assertRaises(StopIteration, shouldThrow)
def testRaisedGeneratorExit1(self):