mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
bpo-36829: Add sys.unraisablehook() (GH-13187)
Add new sys.unraisablehook() function which can be overridden to control how "unraisable exceptions" are handled. It is called when an exception has occurred but there is no way for Python to handle it. For example, when a destructor raises an exception or during garbage collection (gc.collect()). Changes: * Add an internal UnraisableHookArgs type used to pass arguments to sys.unraisablehook. * Add _PyErr_WriteUnraisableDefaultHook(). * The default hook now ignores exception on writing the traceback. * test_sys now uses unittest.main() to automatically discover tests: remove test_main(). * Add _PyErr_Init(). * Fix PyErr_WriteUnraisable(): hold a strong reference to sys.stderr while using it
This commit is contained in:
parent
2725cb01d7
commit
ef9d9b6312
12 changed files with 497 additions and 123 deletions
|
@ -876,6 +876,81 @@ class SysModuleTest(unittest.TestCase):
|
|||
self.assertEqual(out, 'mbcs replace')
|
||||
|
||||
|
||||
@test.support.cpython_only
|
||||
class UnraisableHookTest(unittest.TestCase):
|
||||
def write_unraisable_exc(self, exc, obj):
|
||||
import _testcapi
|
||||
import types
|
||||
try:
|
||||
# raise the exception to get a traceback in the except block
|
||||
try:
|
||||
raise exc
|
||||
except Exception as exc2:
|
||||
_testcapi.write_unraisable_exc(exc2, obj)
|
||||
return types.SimpleNamespace(exc_type=type(exc2),
|
||||
exc_value=exc2,
|
||||
exc_traceback=exc2.__traceback__,
|
||||
object=obj)
|
||||
finally:
|
||||
# Explicitly break any reference cycle
|
||||
exc = None
|
||||
exc2 = None
|
||||
|
||||
def test_original_unraisablehook(self):
|
||||
obj = "an object"
|
||||
|
||||
with test.support.captured_output("stderr") as stderr:
|
||||
with test.support.swap_attr(sys, 'unraisablehook',
|
||||
sys.__unraisablehook__):
|
||||
self.write_unraisable_exc(ValueError(42), obj)
|
||||
|
||||
err = stderr.getvalue()
|
||||
self.assertIn(f'Exception ignored in: {obj!r}\n', err)
|
||||
self.assertIn('Traceback (most recent call last):\n', err)
|
||||
self.assertIn('ValueError: 42\n', err)
|
||||
|
||||
def test_original_unraisablehook_wrong_type(self):
|
||||
exc = ValueError(42)
|
||||
with test.support.swap_attr(sys, 'unraisablehook',
|
||||
sys.__unraisablehook__):
|
||||
with self.assertRaises(TypeError):
|
||||
sys.unraisablehook(exc)
|
||||
|
||||
def test_custom_unraisablehook(self):
|
||||
hook_args = None
|
||||
|
||||
def hook_func(args):
|
||||
nonlocal hook_args
|
||||
hook_args = args
|
||||
|
||||
obj = object()
|
||||
try:
|
||||
with test.support.swap_attr(sys, 'unraisablehook', hook_func):
|
||||
expected = self.write_unraisable_exc(ValueError(42), obj)
|
||||
for attr in "exc_type exc_value exc_traceback object".split():
|
||||
self.assertEqual(getattr(hook_args, attr),
|
||||
getattr(expected, attr),
|
||||
(hook_args, expected))
|
||||
finally:
|
||||
# expected and hook_args contain an exception: break reference cycle
|
||||
expected = None
|
||||
hook_args = None
|
||||
|
||||
def test_custom_unraisablehook_fail(self):
|
||||
def hook_func(*args):
|
||||
raise Exception("hook_func failed")
|
||||
|
||||
with test.support.captured_output("stderr") as stderr:
|
||||
with test.support.swap_attr(sys, 'unraisablehook', hook_func):
|
||||
self.write_unraisable_exc(ValueError(42), None)
|
||||
|
||||
err = stderr.getvalue()
|
||||
self.assertIn(f'Exception ignored in: {hook_func!r}\n',
|
||||
err)
|
||||
self.assertIn('Traceback (most recent call last):\n', err)
|
||||
self.assertIn('Exception: hook_func failed\n', err)
|
||||
|
||||
|
||||
@test.support.cpython_only
|
||||
class SizeofTest(unittest.TestCase):
|
||||
|
||||
|
@ -1277,8 +1352,5 @@ class SizeofTest(unittest.TestCase):
|
|||
self.assertIsNone(cur.finalizer)
|
||||
|
||||
|
||||
def test_main():
|
||||
test.support.run_unittest(SysModuleTest, SizeofTest)
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_main()
|
||||
unittest.main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue