Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit e97910c

Browse filesBrowse files
iritkatrieliritkatriel
authored
gh-125522 : add explicit exception types to bare excepts in tests (#125523)
1 parent c9826c1 commit e97910c
Copy full SHA for e97910c
Expand file treeCollapse file tree

11 files changed

+38
-38
lines changed

‎Lib/test/test_cmd_line_script.py

Copy file name to clipboardExpand all lines: Lib/test/test_cmd_line_script.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ def test_pep_409_verbiage(self):
543543
script = textwrap.dedent("""\
544544
try:
545545
raise ValueError
546-
except:
546+
except ValueError:
547547
raise NameError from None
548548
""")
549549
with os_helper.temp_dir() as script_dir:

‎Lib/test/test_coroutines.py

Copy file name to clipboardExpand all lines: Lib/test/test_coroutines.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ async def f():
11851185
async def g():
11861186
try:
11871187
raise KeyError
1188-
except:
1188+
except KeyError:
11891189
return await f()
11901190

11911191
_, result = run_async(g())

‎Lib/test/test_file.py

Copy file name to clipboardExpand all lines: Lib/test/test_file.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def testMethods(self):
126126
# it must also return None if an exception was given
127127
try:
128128
1/0
129-
except:
129+
except ZeroDivisionError:
130130
self.assertEqual(self.f.__exit__(*sys.exc_info()), None)
131131

132132
def testReadWhenWriting(self):

‎Lib/test/test_listcomps.py

Copy file name to clipboardExpand all lines: Lib/test/test_listcomps.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ def test_comp_in_try_except(self):
609609
result = snapshot = None
610610
try:
611611
result = [{func}(value) for value in value]
612-
except:
612+
except ValueError:
613613
snapshot = value
614614
raise
615615
"""
@@ -643,7 +643,7 @@ def test_exception_in_post_comp_call(self):
643643
value = [1, None]
644644
try:
645645
[v for v in value].sort()
646-
except:
646+
except TypeError:
647647
pass
648648
"""
649649
self._check_in_scopes(code, {"value": [1, None]})

‎Lib/test/test_logging.py

Copy file name to clipboardExpand all lines: Lib/test/test_logging.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4877,7 +4877,7 @@ def test_formatting(self):
48774877
r.addHandler(h)
48784878
try:
48794879
raise RuntimeError('deliberate mistake')
4880-
except:
4880+
except RuntimeError:
48814881
logging.exception('failed', stack_info=True)
48824882
r.removeHandler(h)
48834883
h.close()

‎Lib/test/test_pdb.py

Copy file name to clipboardExpand all lines: Lib/test/test_pdb.py
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ def test_convenience_variables():
10811081
... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
10821082
... try:
10831083
... raise Exception('test')
1084-
... except:
1084+
... except Exception:
10851085
... pass
10861086
... return 1
10871087
@@ -1153,7 +1153,7 @@ def test_convenience_variables():
11531153
Exception('test')
11541154
(Pdb) next
11551155
> <doctest test.test_pdb.test_convenience_variables[0]>(5)util_function()
1156-
-> except:
1156+
-> except Exception:
11571157
(Pdb) $_exception
11581158
*** KeyError: '_exception'
11591159
(Pdb) return

‎Lib/test/test_peepholer.py

Copy file name to clipboardExpand all lines: Lib/test/test_peepholer.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ def test_load_fast_unknown_after_error_2(self):
766766
def f():
767767
try:
768768
1 / 0
769-
except:
769+
except ZeroDivisionError:
770770
print(a, b, c, d, e, f, g)
771771
a = b = c = d = e = f = g = 1
772772
self.assertInBytecode(f, 'LOAD_FAST_CHECK')

‎Lib/test/test_raise.py

Copy file name to clipboardExpand all lines: Lib/test/test_raise.py
+14-14Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def test_except_reraise(self):
4848
def reraise():
4949
try:
5050
raise TypeError("foo")
51-
except:
51+
except TypeError:
5252
try:
5353
raise KeyError("caught")
5454
except KeyError:
@@ -60,7 +60,7 @@ def test_finally_reraise(self):
6060
def reraise():
6161
try:
6262
raise TypeError("foo")
63-
except:
63+
except TypeError:
6464
try:
6565
raise KeyError("caught")
6666
finally:
@@ -73,15 +73,15 @@ def nested_reraise():
7373
def reraise():
7474
try:
7575
raise TypeError("foo")
76-
except:
76+
except TypeError:
7777
nested_reraise()
7878
self.assertRaises(TypeError, reraise)
7979

8080
def test_raise_from_None(self):
8181
try:
8282
try:
8383
raise TypeError("foo")
84-
except:
84+
except TypeError:
8585
raise ValueError() from None
8686
except ValueError as e:
8787
self.assertIsInstance(e.__context__, TypeError)
@@ -91,7 +91,7 @@ def test_with_reraise1(self):
9191
def reraise():
9292
try:
9393
raise TypeError("foo")
94-
except:
94+
except TypeError:
9595
with Context():
9696
pass
9797
raise
@@ -101,7 +101,7 @@ def test_with_reraise2(self):
101101
def reraise():
102102
try:
103103
raise TypeError("foo")
104-
except:
104+
except TypeError:
105105
with Context():
106106
raise KeyError("caught")
107107
raise
@@ -111,7 +111,7 @@ def test_yield_reraise(self):
111111
def reraise():
112112
try:
113113
raise TypeError("foo")
114-
except:
114+
except TypeError:
115115
yield 1
116116
raise
117117
g = reraise()
@@ -314,7 +314,7 @@ def test_instance_context_instance_raise(self):
314314
try:
315315
try:
316316
raise context
317-
except:
317+
except IndexError:
318318
raise OSError()
319319
except OSError as e:
320320
self.assertIs(e.__context__, context)
@@ -326,7 +326,7 @@ def test_class_context_instance_raise(self):
326326
try:
327327
try:
328328
raise context
329-
except:
329+
except IndexError:
330330
raise OSError()
331331
except OSError as e:
332332
self.assertIsNot(e.__context__, context)
@@ -339,7 +339,7 @@ def test_class_context_class_raise(self):
339339
try:
340340
try:
341341
raise context
342-
except:
342+
except IndexError:
343343
raise OSError
344344
except OSError as e:
345345
self.assertIsNot(e.__context__, context)
@@ -351,7 +351,7 @@ def test_c_exception_context(self):
351351
try:
352352
try:
353353
1/0
354-
except:
354+
except ZeroDivisionError:
355355
raise OSError
356356
except OSError as e:
357357
self.assertIsInstance(e.__context__, ZeroDivisionError)
@@ -362,7 +362,7 @@ def test_c_exception_raise(self):
362362
try:
363363
try:
364364
1/0
365-
except:
365+
except ZeroDivisionError:
366366
xyzzy
367367
except NameError as e:
368368
self.assertIsInstance(e.__context__, ZeroDivisionError)
@@ -459,7 +459,7 @@ def f():
459459
try:
460460
try:
461461
raise ValueError
462-
except:
462+
except ValueError:
463463
del g
464464
raise KeyError
465465
except Exception as e:
@@ -475,7 +475,7 @@ class C:
475475
def __del__(self):
476476
try:
477477
1/0
478-
except:
478+
except ZeroDivisionError:
479479
raise
480480

481481
def f():

‎Lib/test/test_sys_setprofile.py

Copy file name to clipboardExpand all lines: Lib/test/test_sys_setprofile.py
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def f(p):
124124
def test_caught_exception(self):
125125
def f(p):
126126
try: 1/0
127-
except: pass
127+
except ZeroDivisionError: pass
128128
f_ident = ident(f)
129129
self.check_events(f, [(1, 'call', f_ident),
130130
(1, 'return', f_ident),
@@ -133,7 +133,7 @@ def f(p):
133133
def test_caught_nested_exception(self):
134134
def f(p):
135135
try: 1/0
136-
except: pass
136+
except ZeroDivisionError: pass
137137
f_ident = ident(f)
138138
self.check_events(f, [(1, 'call', f_ident),
139139
(1, 'return', f_ident),
@@ -156,9 +156,9 @@ def f(p):
156156
def g(p):
157157
try:
158158
f(p)
159-
except:
159+
except ZeroDivisionError:
160160
try: f(p)
161-
except: pass
161+
except ZeroDivisionError: pass
162162
f_ident = ident(f)
163163
g_ident = ident(g)
164164
self.check_events(g, [(1, 'call', g_ident),
@@ -187,7 +187,7 @@ def g(p):
187187
def test_raise_twice(self):
188188
def f(p):
189189
try: 1/0
190-
except: 1/0
190+
except ZeroDivisionError: 1/0
191191
f_ident = ident(f)
192192
self.check_events(f, [(1, 'call', f_ident),
193193
(1, 'return', f_ident),
@@ -196,7 +196,7 @@ def f(p):
196196
def test_raise_reraise(self):
197197
def f(p):
198198
try: 1/0
199-
except: raise
199+
except ZeroDivisionError: raise
200200
f_ident = ident(f)
201201
self.check_events(f, [(1, 'call', f_ident),
202202
(1, 'return', f_ident),
@@ -320,7 +320,7 @@ def f(p):
320320
def test_caught_exception(self):
321321
def f(p):
322322
try: 1/0
323-
except: pass
323+
except ZeroDivisionError: pass
324324
f_ident = ident(f)
325325
self.check_events(f, [(1, 'call', f_ident),
326326
(1, 'return', f_ident),

‎Lib/test/test_unittest/test_result.py

Copy file name to clipboardExpand all lines: Lib/test/test_unittest/test_result.py
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def test_1(self):
186186
test = Foo('test_1')
187187
try:
188188
test.fail("foo")
189-
except:
189+
except AssertionError:
190190
exc_info_tuple = sys.exc_info()
191191

192192
result = unittest.TestResult()
@@ -214,7 +214,7 @@ def test_1(self):
214214
def get_exc_info():
215215
try:
216216
test.fail("foo")
217-
except:
217+
except AssertionError:
218218
return sys.exc_info()
219219

220220
exc_info_tuple = get_exc_info()
@@ -241,9 +241,9 @@ def get_exc_info():
241241
try:
242242
try:
243243
test.fail("foo")
244-
except:
244+
except AssertionError:
245245
raise ValueError(42)
246-
except:
246+
except ValueError:
247247
return sys.exc_info()
248248

249249
exc_info_tuple = get_exc_info()
@@ -271,7 +271,7 @@ def get_exc_info():
271271
loop.__cause__ = loop
272272
loop.__context__ = loop
273273
raise loop
274-
except:
274+
except Exception:
275275
return sys.exc_info()
276276

277277
exc_info_tuple = get_exc_info()
@@ -300,7 +300,7 @@ def get_exc_info():
300300
ex1.__cause__ = ex2
301301
ex2.__context__ = ex1
302302
raise C
303-
except:
303+
except Exception:
304304
return sys.exc_info()
305305

306306
exc_info_tuple = get_exc_info()
@@ -345,7 +345,7 @@ def test_1(self):
345345
test = Foo('test_1')
346346
try:
347347
raise TypeError()
348-
except:
348+
except TypeError:
349349
exc_info_tuple = sys.exc_info()
350350

351351
result = unittest.TestResult()

‎Lib/test/test_with.py

Copy file name to clipboardExpand all lines: Lib/test/test_with.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ def testExceptionInExprList(self):
719719
try:
720720
with self.Dummy() as a, self.InitRaises():
721721
pass
722-
except:
722+
except RuntimeError:
723723
pass
724724
self.assertTrue(a.enter_called)
725725
self.assertTrue(a.exit_called)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.