Move log cleanup to finally

Author: crimsonknave

annotated_logger/__init__.py

@@ -653,7 +653,7 @@ def annotate_logs(
     # Between the overloads and the two inner method definitions,
     # there's not much I can do to reduce the complexity more.
     # So, ignoring the complexity metric
-    def annotate_logs(  # noqa: C901
+    def annotate_logs(  # noqa: C901 PLR0915
         self,
         logger_name: str | None = None,
         *,
@@ -787,7 +787,8 @@ def wrap_function(*args: P.args, **kwargs: P.kwargs) -> R:
                     if post_call and not post_call_attempted:
                         _attempt_post_call(post_call, logger, *new_args, **new_kwargs)  # pyright: ignore[reportCallIssue]
                     raise
-                logging.root.manager.loggerDict.pop(logger.logger.name, None)
+                finally:
+                    logging.root.manager.loggerDict.pop(logger.logger.name, None)
                 return result
 
             return wrap_function

test/test_memory.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 import logging
 
 import pytest
@@ -10,17 +11,21 @@
 
 
 class TestMemory:
+    @pytest.mark.parametrize("denominator", [2, 0])
     @pytest.mark.limit_memory("10 MB")
-    def test_repeated_calls_do_not_accumulate_memory(self):
-        calc = example.calculator.Calculator(1, 2)
+    def test_repeated_calls_do_not_accumulate_memory(self, denominator):
+        calc = example.calculator.Calculator(1, denominator)
         for _ in range(10000):
-            calc.add()
+            with contextlib.suppress(ZeroDivisionError):
+                calc.divide()
 
-    def test_repeated_calls_do_not_accumulate_loggers(self):
-        calc = example.calculator.Calculator(1, 2)
+    @pytest.mark.parametrize("denominator", [2, 0])
+    def test_repeated_calls_do_not_accumulate_loggers(self, denominator):
+        calc = example.calculator.Calculator(1, denominator)
         starting_loggers = len(logging.root.manager.loggerDict)
         for _ in range(1000):
-            calc.add()
+            with contextlib.suppress(ZeroDivisionError):
+                calc.divide()
 
         ending_loggers = len(logging.root.manager.loggerDict)
         assert starting_loggers == ending_loggers