updates

Backend/venv/lib/python3.12/site-packages/_pytest/setuponly.py

@@ -1,7 +1,8 @@
-from __future__ import annotations
-
-from collections.abc import Generator
+from typing import Generator
+from typing import Optional
+from typing import Union
 
+import pytest
 from _pytest._io.saferepr import saferepr
 from _pytest.config import Config
 from _pytest.config import ExitCode
@@ -9,7 +10,6 @@ from _pytest.config.argparsing import Parser
 from _pytest.fixtures import FixtureDef
 from _pytest.fixtures import SubRequest
 from _pytest.scope import Scope
-import pytest
 
 
 def pytest_addoption(parser: Parser) -> None:
@@ -28,42 +28,37 @@ def pytest_addoption(parser: Parser) -> None:
     )
 
 
-@pytest.hookimpl(wrapper=True)
+@pytest.hookimpl(hookwrapper=True)
 def pytest_fixture_setup(
     fixturedef: FixtureDef[object], request: SubRequest
-) -> Generator[None, object, object]:
-    try:
-        return (yield)
-    finally:
-        if request.config.option.setupshow:
-            if hasattr(request, "param"):
-                # Save the fixture parameter so ._show_fixture_action() can
-                # display it now and during the teardown (in .finish()).
-                if fixturedef.ids:
-                    if callable(fixturedef.ids):
-                        param = fixturedef.ids(request.param)
-                    else:
-                        param = fixturedef.ids[request.param_index]
+) -> Generator[None, None, None]:
+    yield
+    if request.config.option.setupshow:
+        if hasattr(request, "param"):
+            # Save the fixture parameter so ._show_fixture_action() can
+            # display it now and during the teardown (in .finish()).
+            if fixturedef.ids:
+                if callable(fixturedef.ids):
+                    param = fixturedef.ids(request.param)
                 else:
-                    param = request.param
-                fixturedef.cached_param = param  # type: ignore[attr-defined]
-            _show_fixture_action(fixturedef, request.config, "SETUP")
+                    param = fixturedef.ids[request.param_index]
+            else:
+                param = request.param
+            fixturedef.cached_param = param  # type: ignore[attr-defined]
+        _show_fixture_action(fixturedef, "SETUP")
 
 
-def pytest_fixture_post_finalizer(
-    fixturedef: FixtureDef[object], request: SubRequest
-) -> None:
+def pytest_fixture_post_finalizer(fixturedef: FixtureDef[object]) -> None:
     if fixturedef.cached_result is not None:
-        config = request.config
+        config = fixturedef._fixturemanager.config
         if config.option.setupshow:
-            _show_fixture_action(fixturedef, request.config, "TEARDOWN")
+            _show_fixture_action(fixturedef, "TEARDOWN")
             if hasattr(fixturedef, "cached_param"):
-                del fixturedef.cached_param
+                del fixturedef.cached_param  # type: ignore[attr-defined]
 
 
-def _show_fixture_action(
-    fixturedef: FixtureDef[object], config: Config, msg: str
-) -> None:
+def _show_fixture_action(fixturedef: FixtureDef[object], msg: str) -> None:
+    config = fixturedef._fixturemanager.config
     capman = config.pluginmanager.getplugin("capturemanager")
     if capman:
         capman.suspend_global_capture()
@@ -73,9 +68,13 @@ def _show_fixture_action(
     # Use smaller indentation the higher the scope: Session = 0, Package = 1, etc.
     scope_indent = list(reversed(Scope)).index(fixturedef._scope)
     tw.write(" " * 2 * scope_indent)
-
-    scopename = fixturedef.scope[0].upper()
-    tw.write(f"{msg:<8} {scopename} {fixturedef.argname}")
+    tw.write(
+        "{step} {scope} {fixture}".format(
+            step=msg.ljust(8),  # align the output to TEARDOWN
+            scope=fixturedef.scope[0].upper(),
+            fixture=fixturedef.argname,
+        )
+    )
 
     if msg == "SETUP":
         deps = sorted(arg for arg in fixturedef.argnames if arg != "request")
@@ -83,7 +82,7 @@ def _show_fixture_action(
             tw.write(" (fixtures used: {})".format(", ".join(deps)))
 
     if hasattr(fixturedef, "cached_param"):
-        tw.write(f"[{saferepr(fixturedef.cached_param, maxsize=42)}]")
+        tw.write(f"[{saferepr(fixturedef.cached_param, maxsize=42)}]")  # type: ignore[attr-defined]
 
     tw.flush()
 
@@ -92,7 +91,7 @@ def _show_fixture_action(
 
 
 @pytest.hookimpl(tryfirst=True)
-def pytest_cmdline_main(config: Config) -> int | ExitCode | None:
+def pytest_cmdline_main(config: Config) -> Optional[Union[int, ExitCode]]:
     if config.option.setuponly:
         config.option.setupshow = True
     return None