mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-07 19:35:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge #20317 from 3.3

Browse source
This commit is contained in:
Nick Coghlan 2014-01-22 23:04:37 +10:00
commit d58831e688
3 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/contextlib.py
View file

@ -298,11 +298,19 @@ class ExitStack(object):
# we were actually nesting multiple with statements
frame_exc = sys.exc_info()[1]
def _fix_exception_context(new_exc, old_exc):
# Context isn't what we want, so find the end of the chain
while 1:
exc_context = new_exc.__context__
if exc_context in (None, frame_exc):
if exc_context is old_exc:
# Context is already set correctly (see issue 20317)
return
if exc_context is None or exc_context is frame_exc:
break
details = id(new_exc), id(old_exc), id(exc_context)
raise Exception(str(details))
new_exc = exc_context
# Change the end of the chain to point to the exception
# we expect it to reference
new_exc.__context__ = old_exc
# Callbacks are invoked in LIFO order to match the behaviour of