summaryrefslogtreecommitdiffstats
path: root/Lib/contextlib.py
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2023-01-03 16:18:45 (GMT)
committerGitHub <noreply@github.com>2023-01-03 16:18:45 (GMT)
commit861cdefc1bccd419bd268a9f60b34bffbaff9ea2 (patch)
tree3449e145139fb7ba6f2a78806097919a42cbb542 /Lib/contextlib.py
parentb99ac1dbc081e4f2d2e68906e9c7c535e628611a (diff)
downloadcpython-861cdefc1bccd419bd268a9f60b34bffbaff9ea2.zip
cpython-861cdefc1bccd419bd268a9f60b34bffbaff9ea2.tar.gz
cpython-861cdefc1bccd419bd268a9f60b34bffbaff9ea2.tar.bz2
gh-95882: fix regression in the traceback of exceptions propagated from inside a contextlib context manager (GH-95883)
(cherry picked from commit b3722ca058f6a6d6505cf2ea9ffabaf7fb6b6e19) Co-authored-by: Thomas Grainger <tagrain@gmail.com>
Diffstat (limited to 'Lib/contextlib.py')
-rw-r--r--Lib/contextlib.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Lib/contextlib.py b/Lib/contextlib.py
index 625bb33..58e9a49 100644
--- a/Lib/contextlib.py
+++ b/Lib/contextlib.py
@@ -173,7 +173,7 @@ class _GeneratorContextManager(
isinstance(value, StopIteration)
and exc.__cause__ is value
):
- exc.__traceback__ = traceback
+ value.__traceback__ = traceback
return False
raise
except BaseException as exc:
@@ -228,6 +228,7 @@ class _AsyncGeneratorContextManager(
except RuntimeError as exc:
# Don't re-raise the passed in exception. (issue27122)
if exc is value:
+ exc.__traceback__ = traceback
return False
# Avoid suppressing if a Stop(Async)Iteration exception
# was passed to athrow() and later wrapped into a RuntimeError
@@ -239,6 +240,7 @@ class _AsyncGeneratorContextManager(
isinstance(value, (StopIteration, StopAsyncIteration))
and exc.__cause__ is value
):
+ value.__traceback__ = traceback
return False
raise
except BaseException as exc:
@@ -250,6 +252,7 @@ class _AsyncGeneratorContextManager(
# and the __exit__() protocol.
if exc is not value:
raise
+ exc.__traceback__ = traceback
return False
raise RuntimeError("generator didn't stop after athrow()")