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

Close #14969: Improve the handling of exception chaining in contextlib.ExitStack

Browse source
This commit is contained in:
Nick Coghlan 2012-06-01 22:48:32 +10:00
parent c4b78a3e15
commit 77452fc121
3 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/contextlib.py
View file

@ -225,6 +225,17 @@ class ExitStack(object):
return self
def __exit__(self, *exc_details):
# We manipulate the exception state so it behaves as though
# we were actually nesting multiple with statements
frame_exc = sys.exc_info()[1]
def _fix_exception_context(new_exc, old_exc):
while 1:
exc_context = new_exc.__context__
if exc_context in (None, frame_exc):
break
new_exc = exc_context
new_exc.__context__ = old_exc
# Callbacks are invoked in LIFO order to match the behaviour of
# nested context managers
suppressed_exc = False
@ -236,9 +247,8 @@ class ExitStack(object):
exc_details = (None, None, None)
except:
new_exc_details = sys.exc_info()
if exc_details != (None, None, None):
# simulate the stack of exceptions by setting the context
new_exc_details[1].__context__ = exc_details[1]
# simulate the stack of exceptions by setting the context
_fix_exception_context(new_exc_details[1], exc_details[1])
if not self._exit_callbacks:
raise
exc_details = new_exc_details