Skip to content

Commit

Permalink
gh-125514: fix bug in test_traceback utility. Specify exception types…
Browse files Browse the repository at this point in the history
… in except: clauses (#125516)
  • Loading branch information
iritkatriel authored Oct 15, 2024
1 parent c8a1818 commit 55c4f4c
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions Lib/test/test_traceback.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def test_no_caret_with_no_debug_ranges_flag_python_traceback(self):
import traceback
try:
x = 1 / 0
except:
except ZeroDivisionError:
traceback.print_exc()
""")
try:
Expand Down Expand Up @@ -550,9 +550,10 @@ class PurePythonExceptionFormattingMixin:
def get_exception(self, callable, slice_start=0, slice_end=-1):
try:
callable()
self.fail("No exception thrown.")
except:
except BaseException:
return traceback.format_exc().splitlines()[slice_start:slice_end]
else:
self.fail("No exception thrown.")

callable_line = get_exception.__code__.co_firstlineno + 2

Expand Down Expand Up @@ -2237,7 +2238,7 @@ def test_context_suppression(self):
try:
try:
raise Exception
except:
except Exception:
raise ZeroDivisionError from None
except ZeroDivisionError as _:
e = _
Expand Down Expand Up @@ -2589,9 +2590,9 @@ def exc():
try:
try:
raise EG("eg1", [ValueError(1), TypeError(2)])
except:
except EG:
raise EG("eg2", [ValueError(3), TypeError(4)])
except:
except EG:
raise ImportError(5)

expected = (
Expand Down Expand Up @@ -2641,7 +2642,7 @@ def exc():
except Exception as e:
exc = e
raise EG("eg", [VE(1), exc, VE(4)])
except:
except EG:
raise EG("top", [VE(5)])

expected = (f' + Exception Group Traceback (most recent call last):\n'
Expand Down Expand Up @@ -3454,7 +3455,7 @@ def test_long_context_chain(self):
def f():
try:
1/0
except:
except ZeroDivisionError:
f()

try:
Expand Down Expand Up @@ -3558,7 +3559,7 @@ def test_comparison_params_variations(self):
def raise_exc():
try:
raise ValueError('bad value')
except:
except ValueError:
raise

def raise_with_locals():
Expand Down

0 comments on commit 55c4f4c

Please sign in to comment.