Skip to content

Commit fed5356

Browse files
authored
Merge pull request #6634 from blueyed/fixtures-move-import
fixtures: move import of ParameterSet to top level
2 parents e830432 + 2902c72 commit fed5356

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/_pytest/fixtures.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
from _pytest.compat import TYPE_CHECKING
3232
from _pytest.deprecated import FIXTURE_POSITIONAL_ARGUMENTS
3333
from _pytest.deprecated import FUNCARGNAMES
34+
from _pytest.mark import ParameterSet
3435
from _pytest.outcomes import fail
3536
from _pytest.outcomes import TEST_OUTCOME
3637

@@ -1263,8 +1264,6 @@ def _get_direct_parametrize_args(self, node):
12631264
This things are done later as well when dealing with parametrization
12641265
so this could be improved
12651266
"""
1266-
from _pytest.mark import ParameterSet
1267-
12681267
parametrize_argnames = []
12691268
for marker in node.iter_markers(name="parametrize"):
12701269
if not marker.kwargs.get("indirect", False):

0 commit comments

Comments
 (0)