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

Issue 20317: Remove debugging code from contextlib

Browse source 
- Alex J Burke noticed a debugging raise in the commit that
  fixed the original bug reported in issue 20317
- this showed that multiple iterations through the affected
  loop wasn't actually being tested
This commit is contained in:
Nick Coghlan 2014-01-24 23:05:45 +10:00
parent 5f6bf55965
commit add94c9d82
2 changed files with 49 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/contextlib.py
View file

@ -231,7 +231,7 @@ 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
# Context may not be correct, so find the end of the chain
while 1:
exc_context = new_exc.__context__
if exc_context is old_exc:
@ -239,8 +239,6 @@ class ExitStack(object):
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