diff options
| author | John Belmonte <john@neggie.net> | 2021-10-04 06:49:55 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 06:49:55 (GMT) |
| commit | e6d1aa1ac65b6908fdea2c70ec3aa8c4f1dffcb5 (patch) | |
| tree | 317af9f26a2c7233a73b2fadccd23f91b5f254c5 /Lib/contextlib.py | |
| parent | a25dcaefb7c4eb0767a112cd31fe0b055f168844 (diff) | |
| download | cpython-e6d1aa1ac65b6908fdea2c70ec3aa8c4f1dffcb5.zip cpython-e6d1aa1ac65b6908fdea2c70ec3aa8c4f1dffcb5.tar.gz cpython-e6d1aa1ac65b6908fdea2c70ec3aa8c4f1dffcb5.tar.bz2 | |
bpo-44594: fix (Async)ExitStack handling of __context__ (gh-27089)
* bpo-44594: fix (Async)ExitStack handling of __context__
Make enter_context(foo()) / enter_async_context(foo()) equivalent to
`[async] with foo()` regarding __context__ when an exception is raised.
Previously exceptions would be caught and re-raised with the wrong
context when explicitly overriding __context__ with None.
Diffstat (limited to 'Lib/contextlib.py')
| -rw-r--r-- | Lib/contextlib.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/contextlib.py b/Lib/contextlib.py index 1384d89..d90ca5d 100644 --- a/Lib/contextlib.py +++ b/Lib/contextlib.py @@ -553,10 +553,10 @@ class ExitStack(_BaseExitStack, AbstractContextManager): # 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: + if exc_context is None or 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: + if exc_context is frame_exc: break new_exc = exc_context # Change the end of the chain to point to the exception @@ -693,10 +693,10 @@ class AsyncExitStack(_BaseExitStack, AbstractAsyncContextManager): # 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: + if exc_context is None or 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: + if exc_context is frame_exc: break new_exc = exc_context # Change the end of the chain to point to the exception |