Merge pull request #12023 from bluetech/fixtures-cleanups-2

fixtures: remove an unneeded suppress

Author: bluetech

src/_pytest/fixtures.py

@@ -2,7 +2,6 @@
 import abc
 from collections import defaultdict
 from collections import deque
-from contextlib import suppress
 import dataclasses
 import functools
 import inspect
@@ -578,21 +577,20 @@ def _compute_fixture_value(self, fixturedef: "FixtureDef[object]") -> None:
         # (latter managed by fixturedef)
         argname = fixturedef.argname
         funcitem = self._pyfuncitem
-        scope = fixturedef._scope
         try:
             callspec = funcitem.callspec
         except AttributeError:
             callspec = None
         if callspec is not None and argname in callspec.params:
             param = callspec.params[argname]
             param_index = callspec.indices[argname]
-            # If a parametrize invocation set a scope it will override
-            # the static scope defined with the fixture function.
-            with suppress(KeyError):
-                scope = callspec._arg2scope[argname]
+            # The parametrize invocation scope overrides the fixture's scope.
+            scope = callspec._arg2scope[argname]
         else:
             param = NOTSET
             param_index = 0
+            scope = fixturedef._scope
+
             has_params = fixturedef.params is not None
             fixtures_not_supported = getattr(funcitem, "nofuncargs", False)
             if has_params and fixtures_not_supported: