Use regex approach to retrieve return annotations

Author: kianelbo

src/_pytest/fixtures.py

@@ -18,6 +18,7 @@
 import inspect
 import os
 from pathlib import Path
+import re
 import sys
 import types
 from typing import Any
@@ -2016,20 +2017,13 @@ def _showfixtures_main(config: Config, session: Session) -> None:
 
 
 def get_return_annotation(fixture_func: Callable[..., Any]) -> str:
-    try:
-        sig = signature(fixture_func)
-        annotation = sig.return_annotation
-        if annotation is not sig.empty:
-            if type(annotation) == type(None):
-                return "None"
-            if isinstance(annotation, str):
-                return annotation
-            if annotation.__module__ == "typing":
-                return str(annotation).replace("typing.", "")
-            return str(annotation.__name__)
-    except (ValueError, TypeError):
-        pass
-    return ""
+    pattern = re.compile(r'\b(?:(?:<[^>]+>|[A-Za-z_]\w*)\.)+([A-Za-z_]\w*)\b')
+
+    sig = str(signature(fixture_func))
+    sig_parts = sig.split(" -> ")
+    if len(sig_parts) < 2:
+        return ""
+    return pattern.sub(r'\1', sig_parts[-1])
 
 
 def write_docstring(tw: TerminalWriter, doc: str, indent: str = "    ") -> None:

testing/python/fixtures.py

@@ -1,18 +1,15 @@
 # mypy: allow-untyped-defs
 from __future__ import annotations
 
-from collections.abc import Callable
 from itertools import zip_longest
 import os
 from pathlib import Path
 import sys
 import textwrap
-from typing import Any
 
 from _pytest.compat import getfuncargnames
 from _pytest.config import ExitCode
 from _pytest.fixtures import deduplicate_names
-from _pytest.fixtures import get_return_annotation
 from _pytest.fixtures import TopRequest
 from _pytest.monkeypatch import MonkeyPatch
 from _pytest.pytester import get_public_names
@@ -3626,23 +3623,6 @@ def arg1():
         )
         result.stdout.no_fnmatch_line("*arg0*")
 
-    def test_show_fixtures_return_annotation(self, pytester: Pytester) -> None:
-        p = pytester.makepyfile(
-            """
-            import pytest
-            @pytest.fixture
-            def six() -> int:
-                return 6
-        """
-        )
-        result = pytester.runpytest("--fixtures", p)
-        result.stdout.fnmatch_lines(
-            """
-            *fixtures defined from*
-            *six -> int -- test_show_fixtures_return_annotation.py:3*
-        """
-        )
-
     @pytest.mark.parametrize("testmod", [True, False])
     def test_show_fixtures_conftest(self, pytester: Pytester, testmod) -> None:
         pytester.makeconftest(
@@ -4584,53 +4564,6 @@ def test_1(self, myfix):
         reprec.assertoutcome(passed=1)
 
 
-class TestGetReturnAnnotation:
-    def test_primitive_return_type(self):
-        def six() -> int:
-            return 6
-
-        assert get_return_annotation(six) == "int"
-
-    def test_compound_return_type(self):
-        def two_sixes() -> tuple[int, str]:
-            return (6, "six")
-
-        assert get_return_annotation(two_sixes) == "tuple[int, str]"
-
-    def test_callable_return_type(self):
-        def callable_return() -> Callable[..., Any]:
-            return self.test_compound_return_type
-
-        assert get_return_annotation(callable_return) == "Callable[..., Any]"
-
-    def test_no_annotation(self):
-        def no_annotation():
-            return 6
-
-        assert get_return_annotation(no_annotation) == ""
-
-    def test_none_return_type(self):
-        def none_return() -> None:
-            pass
-
-        assert get_return_annotation(none_return) == "None"
-
-    def test_custom_class_return_type(self):
-        class T:
-            pass
-
-        def class_return() -> T:
-            return T()
-
-        assert get_return_annotation(class_return) == "T"
-
-    def test_enum_return_type(self):
-        def enum_return() -> ExitCode:
-            return ExitCode(0)
-
-        assert get_return_annotation(enum_return) == "ExitCode"
-
-
 def test_call_fixture_function_error():
     """Check if an error is raised if a fixture function is called directly (#4545)"""
 

testing/python/show_fixtures_per_test.py

@@ -160,30 +160,6 @@ def test_args(arg2, arg3):
     )
 
 
-def test_show_return_annotation(pytester: Pytester) -> None:
-    p = pytester.makepyfile(
-        """
-        import pytest
-        @pytest.fixture
-        def five() -> int:
-            return 5
-        def test_five(five):
-            pass
-    """
-    )
-
-    result = pytester.runpytest("--fixtures-per-test", p)
-    assert result.ret == 0
-
-    result.stdout.fnmatch_lines(
-        [
-            "*fixtures used by test_five*",
-            "*(test_show_return_annotation.py:6)*",
-            "five -> int -- test_show_return_annotation.py:3",
-        ]
-    )
-
-
 def test_doctest_items(pytester: Pytester) -> None:
     pytester.makepyfile(
         '''