fix circular imports

Author: blueyed

src/_pytest/compat.py

@@ -25,8 +25,6 @@
 
 import _pytest
 from _pytest._io.saferepr import saferepr
-from _pytest.outcomes import fail
-from _pytest.outcomes import TEST_OUTCOME
 
 if sys.version_info < (3, 5, 2):
     from typing_extensions import TYPE_CHECKING
@@ -154,6 +152,8 @@ def getfuncargnames(
     try:
         parameters = signature(function).parameters
     except (ValueError, TypeError) as e:
+        from _pytest.outcomes import fail
+
         fail(
             "Could not determine arguments of {!r}: {}".format(function, e),
             pytrace=False,
@@ -332,8 +332,12 @@ def safe_getattr(object: Any, name: str, default: Any) -> Any:
     """
     try:
         return getattr(object, name, default)
-    except TEST_OUTCOME:
-        return default
+    except BaseException as exc:
+        from _pytest.outcomes import TEST_OUTCOME
+
+        if isinstance(exc, TEST_OUTCOME):
+            return default
+        raise
 
 
 def safe_isclass(obj: object) -> bool: