nose,fixtures: use the public item API for adding finalizers

Author: bluetech

src/_pytest/fixtures.py

@@ -543,10 +543,8 @@ def addfinalizer(self, finalizer: Callable[[], object]) -> None:
         self._addfinalizer(finalizer, scope=self.scope)
 
     def _addfinalizer(self, finalizer: Callable[[], object], scope) -> None:
-        colitem = self._getscopeitem(scope)
-        self._pyfuncitem.session._setupstate.addfinalizer(
-            finalizer=finalizer, colitem=colitem
-        )
+        item = self._getscopeitem(scope)
+        item.addfinalizer(finalizer)
 
     def applymarker(self, marker: Union[str, MarkDecorator]) -> None:
         """Apply a marker to a single test function invocation.
@@ -694,9 +692,7 @@ def _schedule_finalizers(
         self, fixturedef: "FixtureDef[object]", subrequest: "SubRequest"
     ) -> None:
         # If fixture function failed it might have registered finalizers.
-        self.session._setupstate.addfinalizer(
-            functools.partial(fixturedef.finish, request=subrequest), subrequest.node
-        )
+        subrequest.node.addfinalizer(lambda: fixturedef.finish(request=subrequest))
 
     def _check_scope(
         self,

src/_pytest/nose.py

@@ -13,7 +13,7 @@ def pytest_runtest_setup(item) -> None:
             # Call module level setup if there is no object level one.
             call_optional(item.parent.obj, "setup")
         # XXX This implies we only call teardown when setup worked.
-        item.session._setupstate.addfinalizer((lambda: teardown_nose(item)), item)
+        item.addfinalizer(lambda: teardown_nose(item))
 
 
 def teardown_nose(item) -> None: