Skip to content

Commit 6672a10

Browse files
committed
fixtures: use node.ihook instead of open-coding it
1 parent 4c8fb6f commit 6672a10

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/_pytest/fixtures.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -992,8 +992,8 @@ def finish(self, request: SubRequest) -> None:
992992
if exc:
993993
raise exc
994994
finally:
995-
hook = self._fixturemanager.session.gethookproxy(request.node.path)
996-
hook.pytest_fixture_post_finalizer(fixturedef=self, request=request)
995+
ihook = request.node.ihook
996+
ihook.pytest_fixture_post_finalizer(fixturedef=self, request=request)
997997
# Even if finalization fails, we invalidate the cached fixture
998998
# value and remove all finalizers because they may be bound methods
999999
# which will keep instances alive.
@@ -1027,8 +1027,8 @@ def execute(self, request: SubRequest) -> FixtureValue:
10271027
self.finish(request)
10281028
assert self.cached_result is None
10291029

1030-
hook = self._fixturemanager.session.gethookproxy(request.node.path)
1031-
result = hook.pytest_fixture_setup(fixturedef=self, request=request)
1030+
ihook = request.node.ihook
1031+
result = ihook.pytest_fixture_setup(fixturedef=self, request=request)
10321032
return result
10331033

10341034
def cache_key(self, request: SubRequest) -> object:

0 commit comments

Comments
 (0)