Skip to content

Commit

Permalink
gh-92118: fix traceback of exceptions propagated from inside a contex…
Browse files Browse the repository at this point in the history
…tlib.contextmanager (GH-92202)
  • Loading branch information
iritkatriel authored May 4, 2022
1 parent f8a2fab commit e61330b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Lib/contextlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ def __exit__(self, typ, value, traceback):
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 StopIteration exception
# was passed to throw() and later wrapped into a RuntimeError
Expand All @@ -172,6 +173,7 @@ def __exit__(self, typ, value, traceback):
isinstance(value, StopIteration)
and exc.__cause__ is value
):
exc.__traceback__ = traceback
return False
raise
except BaseException as exc:
Expand All @@ -183,6 +185,7 @@ def __exit__(self, typ, value, traceback):
# and the __exit__() protocol.
if exc is not value:
raise
exc.__traceback__ = traceback
return False
raise RuntimeError("generator didn't stop after throw()")

Expand Down
27 changes: 27 additions & 0 deletions Lib/test/test_contextlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import sys
import tempfile
import threading
import traceback
import unittest
from contextlib import * # Tests __all__
from test import support
Expand Down Expand Up @@ -87,6 +88,32 @@ def woohoo():
raise ZeroDivisionError()
self.assertEqual(state, [1, 42, 999])

def test_contextmanager_traceback(self):
@contextmanager
def f():
yield

try:
with f():
1/0
except ZeroDivisionError as e:
frames = traceback.extract_tb(e.__traceback__)

self.assertEqual(len(frames), 1)
self.assertEqual(frames[0].name, 'test_contextmanager_traceback')
self.assertEqual(frames[0].line, '1/0')

# Repeat with RuntimeError (which goes through a different code path)
try:
with f():
raise NotImplementedError(42)
except NotImplementedError as e:
frames = traceback.extract_tb(e.__traceback__)

self.assertEqual(len(frames), 1)
self.assertEqual(frames[0].name, 'test_contextmanager_traceback')
self.assertEqual(frames[0].line, 'raise NotImplementedError(42)')

def test_contextmanager_no_reraise(self):
@contextmanager
def whee():
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a 3.11 regression in :func:`~contextlib.contextmanager`, which caused it to propagate exceptions with incorrect tracebacks.

0 comments on commit e61330b

Please sign in to comment.