Skip to content

Commit c533015

Browse files
Merge pull request #9880 from jparise/getfixturemarker-attr
Use safe_getattr() in getfixturemarker()
2 parents e547cd5 + e598429 commit c533015

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

src/_pytest/fixtures.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,10 @@ def add_funcarg_pseudo_fixture_def(
223223
def getfixturemarker(obj: object) -> Optional["FixtureFunctionMarker"]:
224224
"""Return fixturemarker or None if it doesn't exist or raised
225225
exceptions."""
226-
try:
227-
fixturemarker: Optional[FixtureFunctionMarker] = getattr(
228-
obj, "_pytestfixturefunction", None
229-
)
230-
except TEST_OUTCOME:
231-
# some objects raise errors like request (from flask import request)
232-
# we don't expect them to be fixture functions
233-
return None
234-
return fixturemarker
226+
return cast(
227+
Optional[FixtureFunctionMarker],
228+
safe_getattr(obj, "_pytestfixturefunction", None),
229+
)
235230

236231

237232
# Parametrized fixture key, helper alias for code below.

0 commit comments

Comments
 (0)