Skip to content

Commit e2e5fa6

Browse files
iritkatrielFidget-Spinner
authored andcommitted
pythongh-102799: remove unnecessary calls to sys.exc_info() in tests (python#102800)
1 parent d451dd0 commit e2e5fa6

File tree

5 files changed

+124
-124
lines changed

5 files changed

+124
-124
lines changed

Lib/test/test_asyncio/test_unix_events.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1889,8 +1889,8 @@ async def test_fork_not_share_event_loop(self):
18891889
os.write(w, b'LOOP:' + str(id(loop)).encode())
18901890
except RuntimeError:
18911891
os.write(w, b'NO LOOP')
1892-
except:
1893-
os.write(w, b'ERROR:' + ascii(sys.exc_info()).encode())
1892+
except BaseException as e:
1893+
os.write(w, b'ERROR:' + ascii(e).encode())
18941894
finally:
18951895
os._exit(0)
18961896
else:

Lib/test/test_exceptions.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -599,8 +599,8 @@ def test_notes(self):
599599
def testWithTraceback(self):
600600
try:
601601
raise IndexError(4)
602-
except:
603-
tb = sys.exc_info()[2]
602+
except Exception as e:
603+
tb = e.__traceback__
604604

605605
e = BaseException().with_traceback(tb)
606606
self.assertIsInstance(e, BaseException)
@@ -653,8 +653,8 @@ def test_invalid_delattr(self):
653653
def testNoneClearsTracebackAttr(self):
654654
try:
655655
raise IndexError(4)
656-
except:
657-
tb = sys.exc_info()[2]
656+
except Exception as e:
657+
tb = e.__traceback__
658658

659659
e = Exception()
660660
e.__traceback__ = tb
@@ -1337,11 +1337,11 @@ class MyException(Exception, metaclass=Meta):
13371337
def g():
13381338
try:
13391339
return g()
1340-
except RecursionError:
1341-
return sys.exc_info()
1342-
e, v, tb = g()
1343-
self.assertIsInstance(v, RecursionError, type(v))
1344-
self.assertIn("maximum recursion depth exceeded", str(v))
1340+
except RecursionError as e:
1341+
return e
1342+
exc = g()
1343+
self.assertIsInstance(exc, RecursionError, type(exc))
1344+
self.assertIn("maximum recursion depth exceeded", str(exc))
13451345

13461346

13471347
@cpython_only

Lib/test/test_socket.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5492,10 +5492,10 @@ def alarm_handler(signal, frame):
54925492
self.fail("caught timeout instead of Alarm")
54935493
except Alarm:
54945494
pass
5495-
except:
5495+
except BaseException as e:
54965496
self.fail("caught other exception instead of Alarm:"
54975497
" %s(%s):\n%s" %
5498-
(sys.exc_info()[:2] + (traceback.format_exc(),)))
5498+
(type(e), e, traceback.format_exc()))
54995499
else:
55005500
self.fail("nothing caught")
55015501
finally:

Lib/test/test_sys.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1649,8 +1649,8 @@ def test_pythontypes(self):
16491649
check(_ast.AST(), size('P'))
16501650
try:
16511651
raise TypeError
1652-
except TypeError:
1653-
tb = sys.exc_info()[2]
1652+
except TypeError as e:
1653+
tb = e.__traceback__
16541654
# traceback
16551655
if tb is not None:
16561656
check(tb, size('2P2i'))

0 commit comments

Comments
 (0)