Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix for bug 1705170 - contextmanager swallowing StopIteration (2.5 backport candidate)

This commit is contained in:
Nick Coghlan 2007-11-02 10:09:12 +00:00
parent ac3d429edc
commit 3814a911aa
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Lib/contextlib.py
View File

@ -25,6 +25,10 @@ class GeneratorContextManager(object):
else: else:
raise RuntimeError("generator didn't stop") raise RuntimeError("generator didn't stop")
else: else:
if value is None:
# Need to force instantiation so we can reliably
# tell if we get the same exception back
value = type()
try: try:
self.gen.throw(type, value, traceback) self.gen.throw(type, value, traceback)
raise RuntimeError("generator didn't stop after throw()") raise RuntimeError("generator didn't stop after throw()")

17
Lib/test/test_with.py
View File

@ -440,6 +440,7 @@ class ExceptionalTestCase(unittest.TestCase, ContextmanagerAssertionMixin):
self.assertAfterWithGeneratorInvariantsNoError(self.bar) self.assertAfterWithGeneratorInvariantsNoError(self.bar)
def testRaisedStopIteration1(self): def testRaisedStopIteration1(self):
# From bug 1462485
@contextmanager @contextmanager
def cm(): def cm():
yield yield
@ -451,6 +452,7 @@ class ExceptionalTestCase(unittest.TestCase, ContextmanagerAssertionMixin):
self.assertRaises(StopIteration, shouldThrow) self.assertRaises(StopIteration, shouldThrow)
def testRaisedStopIteration2(self): def testRaisedStopIteration2(self):
# From bug 1462485
class cm(object): class cm(object):
def __enter__(self): def __enter__(self):
pass pass
@ -463,7 +465,21 @@ class ExceptionalTestCase(unittest.TestCase, ContextmanagerAssertionMixin):
self.assertRaises(StopIteration, shouldThrow) self.assertRaises(StopIteration, shouldThrow)
def testRaisedStopIteration3(self):
# Another variant where the exception hasn't been instantiated
# From bug 1705170
@contextmanager
def cm():
yield
def shouldThrow():
with cm():
raise iter([]).next()
self.assertRaises(StopIteration, shouldThrow)
def testRaisedGeneratorExit1(self): def testRaisedGeneratorExit1(self):
# From bug 1462485
@contextmanager @contextmanager
def cm(): def cm():
yield yield
@ -475,6 +491,7 @@ class ExceptionalTestCase(unittest.TestCase, ContextmanagerAssertionMixin):
self.assertRaises(GeneratorExit, shouldThrow) self.assertRaises(GeneratorExit, shouldThrow)
def testRaisedGeneratorExit2(self): def testRaisedGeneratorExit2(self):
# From bug 1462485
class cm (object): class cm (object):
def __enter__(self): def __enter__(self):
pass pass