fix: don't break the monkeypatch chain (#91)

Mainly libs change this hook, a common practice is to run the existing
hook after or before the custom code.

This avoids breaking monkeypatching of other libs.

Author: sileht

daiquiri/__init__.py

@@ -109,14 +109,17 @@ def setup(
     if set_excepthook:
         program_logger = logging.getLogger(program_name)
 
+        initial_excepthook = staticmethod(sys.excepthook)
+
         def logging_excepthook(
-            exc_type: typing.Optional[typing.Type[BaseException]],
-            value: typing.Optional[BaseException],
+            exc_type: typing.Type[BaseException],
+            value: BaseException,
             tb: typing.Optional[_ptypes.TracebackType],
         ) -> None:
             program_logger.critical(
                 "".join(traceback.format_exception(exc_type, value, tb))
             )
+            initial_excepthook(exc_type, value, tb)
 
         sys.excepthook = logging_excepthook
 

daiquiri/tests/test_daiquiri.py

@@ -12,24 +12,53 @@
 import io
 import json
 import logging
+import sys
+import types
 import typing
 import unittest
 import warnings
 
 import daiquiri
 
+real_excepthook = sys.excepthook
+
 
 class TestDaiquiri(unittest.TestCase):
     def tearDown(self) -> None:
         # Be sure to reset the warning capture
         logging.captureWarnings(False)
+        # Reset exception hook
+        sys.excepthook = real_excepthook
         super(TestDaiquiri, self).tearDown()
 
     def test_setup(self) -> None:
         daiquiri.setup()
         daiquiri.setup(level=logging.DEBUG)
         daiquiri.setup(program_name="foobar")
 
+    def test_excepthook(self) -> None:
+        hook_ran = False
+
+        def catcher(
+            exctype: type[BaseException],
+            value: BaseException,
+            traceback: types.TracebackType | None,
+        ) -> None:
+            nonlocal hook_ran
+            hook_ran = True
+            real_excepthook(exctype, value, traceback)
+
+        sys.excepthook = catcher
+
+        sys.excepthook(Exception, Exception("boom"), None)
+        assert hook_ran
+
+        daiquiri.setup()
+
+        hook_ran = False
+        sys.excepthook(Exception, Exception("boom"), None)
+        assert hook_ran
+
     def test_setup_json_formatter(self) -> None:
         stream = io.StringIO()
         daiquiri.setup(
@@ -67,7 +96,7 @@ def test_capture_warnings(self) -> None:
         line = stream.getvalue()
         self.assertIn("WARNING  py.warnings: ", line)
         self.assertIn(
-            "daiquiri/tests/test_daiquiri.py:66: "
+            "daiquiri/tests/test_daiquiri.py:95: "
             'UserWarning: omg!\n  warnings.warn("omg!")\n',
             line,
         )

daiquiri/tests/test_formatter.py

@@ -71,7 +71,7 @@ def test_empty_keywords(self) -> None:
         )
 
     def test_keywords_no_extras(self) -> None:
-        format_string = "%(levelname)s %(name)s" " %(test)s%(extras)s: %(message)s"
+        format_string = "%(levelname)s %(name)s %(test)s%(extras)s: %(message)s"
         formatter = daiquiri.formatter.ColorExtrasFormatter(
             fmt=format_string, keywords={"test"}
         )
@@ -81,7 +81,7 @@ def test_keywords_no_extras(self) -> None:
         self.assertEqual(self.stream.getvalue(), "INFO my_module a: test message\n")
 
     def test_keywords_with_extras(self) -> None:
-        format_string = "%(levelname)s %(name)s" " %(test)s%(extras)s: %(message)s"
+        format_string = "%(levelname)s %(name)s %(test)s%(extras)s: %(message)s"
         formatter = daiquiri.formatter.ColorExtrasFormatter(
             fmt=format_string, keywords={"test"}
         )