Apply suggestions from @bluetech

Author: DahlitzFlorian

src/_pytest/nodes.py

@@ -29,7 +29,6 @@
 from _pytest.mark.structures import MarkDecorator
 from _pytest.mark.structures import NodeKeywords
 from _pytest.outcomes import fail
-from _pytest.outcomes import Failed
 from _pytest.store import Store
 
 if TYPE_CHECKING:
@@ -332,19 +331,15 @@ def _prunetraceback(self, excinfo):
         pass
 
     def _repr_failure_py(
-        self,
-        excinfo: ExceptionInfo[
-            Union[Failed, FixtureLookupError, ConftestImportFailure]
-        ],
-        style=None,
+        self, excinfo: ExceptionInfo[BaseException], style=None,
     ) -> Union[str, ReprExceptionInfo, ExceptionChainRepr, FixtureLookupErrorRepr]:
+        if isinstance(excinfo.value, ConftestImportFailure):
+            excinfo = ExceptionInfo(excinfo.value.excinfo)
         if isinstance(excinfo.value, fail.Exception):
             if not excinfo.value.pytrace:
                 return str(excinfo.value)
         if isinstance(excinfo.value, FixtureLookupError):
             return excinfo.value.formatrepr()
-        if isinstance(excinfo.value, ConftestImportFailure):
-            excinfo = ExceptionInfo(excinfo.value.excinfo)  # type: ignore
         if self.config.getoption("fulltrace", False):
             style = "long"
         else:

testing/test_reports.py

@@ -404,9 +404,7 @@ def test_report_prevent_ConftestImportFailure_hiding_exception(self, testdir):
         result.stdout.fnmatch_lines(
             ["E   ModuleNotFoundError: No module named 'unknown'"]
         )
-        result.stdout.no_fnmatch_line(
-            "ERROR  - _pytest.config.ConftestImportFailure: ModuleNotFoundError:*"
-        )
+        result.stdout.no_fnmatch_line("ERROR  - *ConftestImportFailure*")
 
 
 class TestHooks: