mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-125522 : add explicit exception types to bare excepts in tests (#125523)

Browse source
This commit is contained in:
Irit Katriel 2024-10-15 17:00:04 +01:00 • committed by GitHub
parent c9826c11db
commit e97910cdb7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 38 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/test/test_cmd_line_script.py
View file

@ -543,7 +543,7 @@ class CmdLineTest(unittest.TestCase):
script = textwrap.dedent("""\ script = textwrap.dedent("""\
try: try:
raise ValueError raise ValueError
except: except ValueError:
raise NameError from None raise NameError from None
""") """)
with os_helper.temp_dir() as script_dir: with os_helper.temp_dir() as script_dir:

2
Lib/test/test_coroutines.py
View file

@ -1185,7 +1185,7 @@ class CoroutineTest(unittest.TestCase):
async def g(): async def g():
try: try:
raise KeyError raise KeyError
except: except KeyError:
return await f() return await f()
_, result = run_async(g()) _, result = run_async(g())

2
Lib/test/test_file.py
View file

@ -126,7 +126,7 @@ class AutoFileTests:
# it must also return None if an exception was given # it must also return None if an exception was given
try: try:
1/0 1/0
except: except ZeroDivisionError:
self.assertEqual(self.f.__exit__(*sys.exc_info()), None) self.assertEqual(self.f.__exit__(*sys.exc_info()), None)
def testReadWhenWriting(self): def testReadWhenWriting(self):

4
Lib/test/test_listcomps.py
View file

@ -609,7 +609,7 @@ class ListComprehensionTest(unittest.TestCase):
result = snapshot = None result = snapshot = None
try: try:
result = [{func}(value) for value in value] result = [{func}(value) for value in value]
except: except ValueError:
snapshot = value snapshot = value
raise raise
""" """
@ -643,7 +643,7 @@ class ListComprehensionTest(unittest.TestCase):
value = [1, None] value = [1, None]
try: try:
[v for v in value].sort() [v for v in value].sort()
except: except TypeError:
pass pass
""" """
self._check_in_scopes(code, {"value": [1, None]}) self._check_in_scopes(code, {"value": [1, None]})

2
Lib/test/test_logging.py
View file

@ -4877,7 +4877,7 @@ class ExceptionTest(BaseTest):
r.addHandler(h) r.addHandler(h)
try: try:
raise RuntimeError('deliberate mistake') raise RuntimeError('deliberate mistake')
except: except RuntimeError:
logging.exception('failed', stack_info=True) logging.exception('failed', stack_info=True)
r.removeHandler(h) r.removeHandler(h)
h.close() h.close()

4
Lib/test/test_pdb.py
View file

@ -1081,7 +1081,7 @@ def test_convenience_variables():
... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace() ... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
... try: ... try:
... raise Exception('test') ... raise Exception('test')
... except: ... except Exception:
... pass ... pass
... return 1 ... return 1
@ -1153,7 +1153,7 @@ def test_convenience_variables():
Exception('test') Exception('test')
(Pdb) next (Pdb) next
> <doctest test.test_pdb.test_convenience_variables[0]>(5)util_function() > <doctest test.test_pdb.test_convenience_variables[0]>(5)util_function()
-> except: -> except Exception:
(Pdb) $_exception (Pdb) $_exception
*** KeyError: '_exception' *** KeyError: '_exception'
(Pdb) return (Pdb) return

2
Lib/test/test_peepholer.py
View file

@ -766,7 +766,7 @@ class TestMarkingVariablesAsUnKnown(BytecodeTestCase):
def f(): def f():
try: try:
1 / 0 1 / 0
except: except ZeroDivisionError:
print(a, b, c, d, e, f, g) print(a, b, c, d, e, f, g)
a = b = c = d = e = f = g = 1 a = b = c = d = e = f = g = 1
self.assertInBytecode(f, 'LOAD_FAST_CHECK') self.assertInBytecode(f, 'LOAD_FAST_CHECK')

28
Lib/test/test_raise.py
View file

@ -48,7 +48,7 @@ class TestRaise(unittest.TestCase):
def reraise(): def reraise():
try: try:
raise TypeError("foo") raise TypeError("foo")
except: except TypeError:
try: try:
raise KeyError("caught") raise KeyError("caught")
except KeyError: except KeyError:
@ -60,7 +60,7 @@ class TestRaise(unittest.TestCase):
def reraise(): def reraise():
try: try:
raise TypeError("foo") raise TypeError("foo")
except: except TypeError:
try: try:
raise KeyError("caught") raise KeyError("caught")
finally: finally:
@ -73,7 +73,7 @@ class TestRaise(unittest.TestCase):
def reraise(): def reraise():
try: try:
raise TypeError("foo") raise TypeError("foo")
except: except TypeError:
nested_reraise() nested_reraise()
self.assertRaises(TypeError, reraise) self.assertRaises(TypeError, reraise)
@ -81,7 +81,7 @@ class TestRaise(unittest.TestCase):
try: try:
try: try:
raise TypeError("foo") raise TypeError("foo")
except: except TypeError:
raise ValueError() from None raise ValueError() from None
except ValueError as e: except ValueError as e:
self.assertIsInstance(e.__context__, TypeError) self.assertIsInstance(e.__context__, TypeError)
@ -91,7 +91,7 @@ class TestRaise(unittest.TestCase):
def reraise(): def reraise():
try: try:
raise TypeError("foo") raise TypeError("foo")
except: except TypeError:
with Context(): with Context():
pass pass
raise raise
@ -101,7 +101,7 @@ class TestRaise(unittest.TestCase):
def reraise(): def reraise():
try: try:
raise TypeError("foo") raise TypeError("foo")
except: except TypeError:
with Context(): with Context():
raise KeyError("caught") raise KeyError("caught")
raise raise
@ -111,7 +111,7 @@ class TestRaise(unittest.TestCase):
def reraise(): def reraise():
try: try:
raise TypeError("foo") raise TypeError("foo")
except: except TypeError:
yield 1 yield 1
raise raise
g = reraise() g = reraise()
@ -314,7 +314,7 @@ class TestContext(unittest.TestCase):
try: try:
try: try:
raise context raise context
except: except IndexError:
raise OSError() raise OSError()
except OSError as e: except OSError as e:
self.assertIs(e.__context__, context) self.assertIs(e.__context__, context)
@ -326,7 +326,7 @@ class TestContext(unittest.TestCase):
try: try:
try: try:
raise context raise context
except: except IndexError:
raise OSError() raise OSError()
except OSError as e: except OSError as e:
self.assertIsNot(e.__context__, context) self.assertIsNot(e.__context__, context)
@ -339,7 +339,7 @@ class TestContext(unittest.TestCase):
try: try:
try: try:
raise context raise context
except: except IndexError:
raise OSError raise OSError
except OSError as e: except OSError as e:
self.assertIsNot(e.__context__, context) self.assertIsNot(e.__context__, context)
@ -351,7 +351,7 @@ class TestContext(unittest.TestCase):
try: try:
try: try:
1/0 1/0
except: except ZeroDivisionError:
raise OSError raise OSError
except OSError as e: except OSError as e:
self.assertIsInstance(e.__context__, ZeroDivisionError) self.assertIsInstance(e.__context__, ZeroDivisionError)
@ -362,7 +362,7 @@ class TestContext(unittest.TestCase):
try: try:
try: try:
1/0 1/0
except: except ZeroDivisionError:
xyzzy xyzzy
except NameError as e: except NameError as e:
self.assertIsInstance(e.__context__, ZeroDivisionError) self.assertIsInstance(e.__context__, ZeroDivisionError)
@ -459,7 +459,7 @@ class TestContext(unittest.TestCase):
try: try:
try: try:
raise ValueError raise ValueError
except: except ValueError:
del g del g
raise KeyError raise KeyError
except Exception as e: except Exception as e:
@ -475,7 +475,7 @@ class TestContext(unittest.TestCase):
def __del__(self): def __del__(self):
try: try:
1/0 1/0
except: except ZeroDivisionError:
raise raise
def f(): def f():

14
Lib/test/test_sys_setprofile.py
View file

@ -124,7 +124,7 @@ class ProfileHookTestCase(TestCaseBase):
def test_caught_exception(self): def test_caught_exception(self):
def f(p): def f(p):
try: 1/0 try: 1/0
except: pass except ZeroDivisionError: pass
f_ident = ident(f) f_ident = ident(f)
self.check_events(f, [(1, 'call', f_ident), self.check_events(f, [(1, 'call', f_ident),
(1, 'return', f_ident), (1, 'return', f_ident),
@ -133,7 +133,7 @@ class ProfileHookTestCase(TestCaseBase):
def test_caught_nested_exception(self): def test_caught_nested_exception(self):
def f(p): def f(p):
try: 1/0 try: 1/0
except: pass except ZeroDivisionError: pass
f_ident = ident(f) f_ident = ident(f)
self.check_events(f, [(1, 'call', f_ident), self.check_events(f, [(1, 'call', f_ident),
(1, 'return', f_ident), (1, 'return', f_ident),
@ -156,9 +156,9 @@ class ProfileHookTestCase(TestCaseBase):
def g(p): def g(p):
try: try:
f(p) f(p)
except: except ZeroDivisionError:
try: f(p) try: f(p)
except: pass except ZeroDivisionError: pass
f_ident = ident(f) f_ident = ident(f)
g_ident = ident(g) g_ident = ident(g)
self.check_events(g, [(1, 'call', g_ident), self.check_events(g, [(1, 'call', g_ident),
@ -187,7 +187,7 @@ class ProfileHookTestCase(TestCaseBase):
def test_raise_twice(self): def test_raise_twice(self):
def f(p): def f(p):
try: 1/0 try: 1/0
except: 1/0 except ZeroDivisionError: 1/0
f_ident = ident(f) f_ident = ident(f)
self.check_events(f, [(1, 'call', f_ident), self.check_events(f, [(1, 'call', f_ident),
(1, 'return', f_ident), (1, 'return', f_ident),
@ -196,7 +196,7 @@ class ProfileHookTestCase(TestCaseBase):
def test_raise_reraise(self): def test_raise_reraise(self):
def f(p): def f(p):
try: 1/0 try: 1/0
except: raise except ZeroDivisionError: raise
f_ident = ident(f) f_ident = ident(f)
self.check_events(f, [(1, 'call', f_ident), self.check_events(f, [(1, 'call', f_ident),
(1, 'return', f_ident), (1, 'return', f_ident),
@ -320,7 +320,7 @@ class ProfileSimulatorTestCase(TestCaseBase):
def test_caught_exception(self): def test_caught_exception(self):
def f(p): def f(p):
try: 1/0 try: 1/0
except: pass except ZeroDivisionError: pass
f_ident = ident(f) f_ident = ident(f)
self.check_events(f, [(1, 'call', f_ident), self.check_events(f, [(1, 'call', f_ident),
(1, 'return', f_ident), (1, 'return', f_ident),

14
Lib/test/test_unittest/test_result.py
View file

@ -186,7 +186,7 @@ class Test_TestResult(unittest.TestCase):
test = Foo('test_1') test = Foo('test_1')
try: try:
test.fail("foo") test.fail("foo")
except: except AssertionError:
exc_info_tuple = sys.exc_info() exc_info_tuple = sys.exc_info()
result = unittest.TestResult() result = unittest.TestResult()
@ -214,7 +214,7 @@ class Test_TestResult(unittest.TestCase):
def get_exc_info(): def get_exc_info():
try: try:
test.fail("foo") test.fail("foo")
except: except AssertionError:
return sys.exc_info() return sys.exc_info()
exc_info_tuple = get_exc_info() exc_info_tuple = get_exc_info()
@ -241,9 +241,9 @@ class Test_TestResult(unittest.TestCase):
try: try:
try: try:
test.fail("foo") test.fail("foo")
except: except AssertionError:
raise ValueError(42) raise ValueError(42)
except: except ValueError:
return sys.exc_info() return sys.exc_info()
exc_info_tuple = get_exc_info() exc_info_tuple = get_exc_info()
@ -271,7 +271,7 @@ class Test_TestResult(unittest.TestCase):
loop.__cause__ = loop loop.__cause__ = loop
loop.__context__ = loop loop.__context__ = loop
raise loop raise loop
except: except Exception:
return sys.exc_info() return sys.exc_info()
exc_info_tuple = get_exc_info() exc_info_tuple = get_exc_info()
@ -300,7 +300,7 @@ class Test_TestResult(unittest.TestCase):
ex1.__cause__ = ex2 ex1.__cause__ = ex2
ex2.__context__ = ex1 ex2.__context__ = ex1
raise C raise C
except: except Exception:
return sys.exc_info() return sys.exc_info()
exc_info_tuple = get_exc_info() exc_info_tuple = get_exc_info()
@ -345,7 +345,7 @@ class Test_TestResult(unittest.TestCase):
test = Foo('test_1') test = Foo('test_1')
try: try:
raise TypeError() raise TypeError()
except: except TypeError:
exc_info_tuple = sys.exc_info() exc_info_tuple = sys.exc_info()
result = unittest.TestResult() result = unittest.TestResult()

2
Lib/test/test_with.py
View file

@ -719,7 +719,7 @@ class NestedWith(unittest.TestCase):
try: try:
with self.Dummy() as a, self.InitRaises(): with self.Dummy() as a, self.InitRaises():
pass pass
except: except RuntimeError:
pass pass
self.assertTrue(a.enter_called) self.assertTrue(a.enter_called)
self.assertTrue(a.exit_called) self.assertTrue(a.exit_called)