From e598429c7305b5fe70165c999489e04d558b0969 Mon Sep 17 00:00:00 2001 From: Jon Parise Date: Fri, 22 Apr 2022 14:38:36 -0700 Subject: [PATCH] Use safe_getattr() in getfixturemarker() --- src/_pytest/fixtures.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py index ee3e93f19..022dbc15f 100644 --- a/src/_pytest/fixtures.py +++ b/src/_pytest/fixtures.py @@ -223,15 +223,10 @@ def add_funcarg_pseudo_fixture_def( def getfixturemarker(obj: object) -> Optional["FixtureFunctionMarker"]: """Return fixturemarker or None if it doesn't exist or raised exceptions.""" - try: - fixturemarker: Optional[FixtureFunctionMarker] = getattr( - obj, "_pytestfixturefunction", None - ) - except TEST_OUTCOME: - # some objects raise errors like request (from flask import request) - # we don't expect them to be fixture functions - return None - return fixturemarker + return cast( + Optional[FixtureFunctionMarker], + safe_getattr(obj, "_pytestfixturefunction", None), + ) # Parametrized fixture key, helper alias for code below.