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

Simplify FixtureFunctionMarker, mark the ctor private

This commit is contained in:
Ran Benita 2023-01-18 22:27:23 +02:00
parent d6b0ed4318
commit 304459cbdc
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/_pytest/fixtures.py
View File

@ -1192,26 +1192,10 @@ class FixtureFunctionMarker:
] = None ] = None
name: Optional[str] = None name: Optional[str] = None
def __init__( _ispytest: dataclasses.InitVar[bool] = False
self,
*, def __post_init__(self, _ispytest: bool) -> None:
scope: "Union[_ScopeName, Callable[[str, Config], _ScopeName]]", check_ispytest(_ispytest)
params: Optional[Iterable[object]],
autouse: bool,
ids: Optional[
Union[Sequence[Optional[object]], Callable[[Any], Optional[object]]]
],
name: Optional[str] = None,
) -> None:
object.__setattr__(self, "scope", scope)
object.__setattr__(
self, "params", tuple(params) if params is not None else None
)
object.__setattr__(self, "autouse", autouse)
object.__setattr__(
self, "ids", None if ids is None else ids if callable(ids) else tuple(ids)
)
object.__setattr__(self, "name", name)
def __call__(self, function: FixtureFunction) -> FixtureFunction: def __call__(self, function: FixtureFunction) -> FixtureFunction:
if inspect.isclass(function): if inspect.isclass(function):
@ -1332,10 +1316,11 @@ def fixture( # noqa: F811
""" """
fixture_marker = FixtureFunctionMarker( fixture_marker = FixtureFunctionMarker(
scope=scope, scope=scope,
params=params, params=tuple(params) if params is not None else None,
autouse=autouse, autouse=autouse,
ids=ids, ids=None if ids is None else ids if callable(ids) else tuple(ids),
name=name, name=name,
_ispytest=True,
) )
# Direct decoration. # Direct decoration.