p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9152 from bluetech/mark-optimize 

mark/structures: slightly optimize some functions
This commit is contained in:
Ran Benita 2021-10-02 15:57:57 +03:00 committed by GitHub
parent 2cfce8d8c4 637e8efdd4
commit 0fbfd1ca36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/_pytest/mark/structures.py
View File

@ -360,7 +360,7 @@ class MarkDecorator:
return self.with_args(*args, **kwargs)
def get_unpacked_marks(obj) -> List[Mark]:
def get_unpacked_marks(obj: object) -> Iterable[Mark]:
"""Obtain the unpacked marks that are stored on an object."""
mark_list = getattr(obj, "pytestmark", [])
if not isinstance(mark_list, list):
@ -368,7 +368,9 @@ def get_unpacked_marks(obj) -> List[Mark]:
return normalize_mark_list(mark_list)
def normalize_mark_list(mark_list: Iterable[Union[Mark, MarkDecorator]]) -> List[Mark]:
def normalize_mark_list(
mark_list: Iterable[Union[Mark, MarkDecorator]]
) -> Iterable[Mark]:
"""
Normalize an iterable of Mark or MarkDecorator objects into a list of marks
by retrieving the `mark` attribute on MarkDecorator instances.
@ -376,14 +378,11 @@ def normalize_mark_list(mark_list: Iterable[Union[Mark, MarkDecorator]]) -> List
:param mark_list: marks to normalize
:returns: A new list of the extracted Mark objects
"""
def parse_mark(mark: Union[Mark, MarkDecorator]) -> Mark:
for mark in mark_list:
mark_obj = getattr(mark, "mark", mark)
if not isinstance(mark_obj, Mark):
raise TypeError(f"got {repr(mark_obj)} instead of Mark")
return mark_obj
return [parse_mark(x) for x in mark_list]
yield mark_obj
def store_mark(obj, mark: Mark) -> None:
@ -394,7 +393,7 @@ def store_mark(obj, mark: Mark) -> None:
assert isinstance(mark, Mark), mark
# Always reassign name to avoid updating pytestmark in a reference that
# was only borrowed.
obj.pytestmark = get_unpacked_marks(obj) + [mark]
obj.pytestmark = [*get_unpacked_marks(obj), mark]
# Typing for builtin pytest marks. This is cheating; it gives builtin marks