diff options
author | Gregory P. Smith <greg@krypto.org> | 2016-06-14 16:19:20 (GMT) |
---|---|---|
committer | Gregory P. Smith <greg@krypto.org> | 2016-06-14 16:19:20 (GMT) |
commit | ba2ecd68414b9c53d00560579f5bc13459bc0449 (patch) | |
tree | 0f23b73c117c222dbb5b3781afb3f7dc3462a9f9 /Lib/contextlib.py | |
parent | c72828ba3377a2139f36b8fdc9b0cbd5dd798712 (diff) | |
download | cpython-ba2ecd68414b9c53d00560579f5bc13459bc0449.zip cpython-ba2ecd68414b9c53d00560579f5bc13459bc0449.tar.gz cpython-ba2ecd68414b9c53d00560579f5bc13459bc0449.tar.bz2 |
Issue #27123: When an exception is raised within the context being
managed by a contextlib.ExitStack() and one of the exit stack
generators catches and raises it in a chain, do not re-raise the
original exception when exiting, let the new chained one through.
This avoids the PEP 479 bug described in issue25782.
Diffstat (limited to 'Lib/contextlib.py')
-rw-r--r-- | Lib/contextlib.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/contextlib.py b/Lib/contextlib.py index 5377987..d44edd6 100644 --- a/Lib/contextlib.py +++ b/Lib/contextlib.py @@ -82,6 +82,9 @@ class _GeneratorContextManager(ContextDecorator): # raised inside the "with" statement from being suppressed. return exc is not value except RuntimeError as exc: + # Don't re-raise the passed in exception. (issue27112) + if exc is value: + return False # Likewise, avoid suppressing if a StopIteration exception # was passed to throw() and later wrapped into a RuntimeError # (see PEP 479). |