mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Fix a bug in nested() - if one of the sub-context-managers swallows the
exception, it should not be propagated up. With unit tests.
This commit is contained in:
parent
6db0e00d57
commit
a9f068726f
2 changed files with 58 additions and 1 deletions
|
@ -107,6 +107,60 @@ class NestedTestCase(unittest.TestCase):
|
|||
else:
|
||||
self.fail("Didn't raise ZeroDivisionError")
|
||||
|
||||
def test_nested_b_swallows(self):
|
||||
@contextmanager
|
||||
def a():
|
||||
yield
|
||||
@contextmanager
|
||||
def b():
|
||||
try:
|
||||
yield
|
||||
except:
|
||||
# Swallow the exception
|
||||
pass
|
||||
try:
|
||||
with nested(a(), b()):
|
||||
1/0
|
||||
except ZeroDivisionError:
|
||||
self.fail("Didn't swallow ZeroDivisionError")
|
||||
|
||||
def test_nested_break(self):
|
||||
@contextmanager
|
||||
def a():
|
||||
yield
|
||||
state = 0
|
||||
while True:
|
||||
state += 1
|
||||
with nested(a(), a()):
|
||||
break
|
||||
state += 10
|
||||
self.assertEqual(state, 1)
|
||||
|
||||
def test_nested_continue(self):
|
||||
@contextmanager
|
||||
def a():
|
||||
yield
|
||||
state = 0
|
||||
while state < 3:
|
||||
state += 1
|
||||
with nested(a(), a()):
|
||||
continue
|
||||
state += 10
|
||||
self.assertEqual(state, 3)
|
||||
|
||||
def test_nested_return(self):
|
||||
@contextmanager
|
||||
def a():
|
||||
try:
|
||||
yield
|
||||
except:
|
||||
pass
|
||||
def foo():
|
||||
with nested(a(), a()):
|
||||
return 1
|
||||
return 10
|
||||
self.assertEqual(foo(), 1)
|
||||
|
||||
class ClosingTestCase(unittest.TestCase):
|
||||
|
||||
# XXX This needs more work
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue