floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6634 from blueyed/fixtures-move-import 

fixtures: move import of ParameterSet to top level
This commit is contained in:
Daniel Hahler 2020-01-30 23:22:39 +01:00 committed by GitHub
parent e830432592 2902c7263c
commit fed5356941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/_pytest/fixtures.py
View File

@ -31,6 +31,7 @@ from _pytest.compat import safe_getattr
from _pytest.compat import TYPE_CHECKING from _pytest.compat import TYPE_CHECKING
from _pytest.deprecated import FIXTURE_POSITIONAL_ARGUMENTS from _pytest.deprecated import FIXTURE_POSITIONAL_ARGUMENTS
from _pytest.deprecated import FUNCARGNAMES from _pytest.deprecated import FUNCARGNAMES
from _pytest.mark import ParameterSet
from _pytest.outcomes import fail from _pytest.outcomes import fail
from _pytest.outcomes import TEST_OUTCOME from _pytest.outcomes import TEST_OUTCOME
@ -1263,8 +1264,6 @@ class FixtureManager:
This things are done later as well when dealing with parametrization This things are done later as well when dealing with parametrization
so this could be improved so this could be improved
""" """
from _pytest.mark import ParameterSet
parametrize_argnames = [] parametrize_argnames = []
for marker in node.iter_markers(name="parametrize"): for marker in node.iter_markers(name="parametrize"):
if not marker.kwargs.get("indirect", False): if not marker.kwargs.get("indirect", False):