gh-125514: fix bug in test_traceback utility. Specify exception types in except: clauses (#125516)

This commit is contained in:
Irit Katriel 2024-10-15 15:11:02 +01:00 committed by GitHub
parent c8a1818fb0
commit 55c4f4c30b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -150,7 +150,7 @@ class TracebackCases(unittest.TestCase):
import traceback
try:
x = 1 / 0
except:
except ZeroDivisionError:
traceback.print_exc()
""")
try:
@ -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
@ -2237,7 +2238,7 @@ class BaseExceptionReportingTests:
try:
try:
raise Exception
except:
except Exception:
raise ZeroDivisionError from None
except ZeroDivisionError as _:
e = _
@ -2589,9 +2590,9 @@ class BaseExceptionReportingTests:
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 = (
@ -2641,7 +2642,7 @@ class BaseExceptionReportingTests:
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'
@ -3454,7 +3455,7 @@ class TestTracebackException(unittest.TestCase):
def f():
try:
1/0
except:
except ZeroDivisionError:
f()
try:
@ -3558,7 +3559,7 @@ class TestTracebackException(unittest.TestCase):
def raise_exc():
try:
raise ValueError('bad value')
except:
except ValueError:
raise
def raise_with_locals():