Revert changes to catching_logs

Author: Felix Nieuwenhuizen

src/_pytest/logging.py

@@ -7,7 +7,6 @@
 from typing import Dict
 from typing import List
 from typing import Mapping
-from typing import Optional
 
 import pytest
 from _pytest.compat import nullcontext
@@ -261,13 +260,10 @@ def add_option_ini(option, dest, default=None, type=None, **kwargs):
 
 
 @contextmanager
-def catching_logs(handler: Optional["LogCaptureHandler"], formatter=None, level=None):
+def catching_logs(handler, formatter=None, level=None):
     """Context manager that prepares the whole logging machinery properly."""
     root_logger = logging.getLogger()
 
-    if handler is None:
-        handler = LogCaptureHandler()
-
     if formatter is not None:
         handler.setFormatter(formatter)
     if level is not None:
@@ -600,7 +596,10 @@ def pytest_collection(self):
             if self.log_cli_handler:
                 self.log_cli_handler.set_when("collection")
 
-            with catching_logs(self.log_file_handler, level=self.log_file_level):
+            with catching_logs(
+                self.log_file_handler if self.log_file_handler else LogCaptureHandler(),
+                level=self.log_file_level,
+            ):
                 yield
 
     @contextmanager