jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

assertion/util: remove unhelpful `type_fns` indirection 

It doesn't serve any purpose that I am able to discern.
This commit is contained in:
Ran Benita 2020-10-30 21:15:48 +02:00
parent 0cd190f037
commit 5913cd20ec
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/_pytest/assertion/util.py
View File

@ -9,7 +9,6 @@ from typing import List
from typing import Mapping from typing import Mapping
from typing import Optional from typing import Optional
from typing import Sequence from typing import Sequence
from typing import Tuple
import _pytest._code import _pytest._code
from _pytest import outcomes from _pytest import outcomes
@ -179,8 +178,7 @@ def _compare_eq_any(left: Any, right: Any, verbose: int = 0) -> List[str]:
elif isdict(left) and isdict(right): elif isdict(left) and isdict(right):
explanation = _compare_eq_dict(left, right, verbose) explanation = _compare_eq_dict(left, right, verbose)
elif type(left) == type(right) and (isdatacls(left) or isattrs(left)): elif type(left) == type(right) and (isdatacls(left) or isattrs(left)):
type_fn = (isdatacls, isattrs) explanation = _compare_eq_cls(left, right, verbose)
explanation = _compare_eq_cls(left, right, verbose, type_fn)
elif verbose > 0: elif verbose > 0:
explanation = _compare_eq_verbose(left, right) explanation = _compare_eq_verbose(left, right)
if isiterable(left) and isiterable(right): if isiterable(left) and isiterable(right):
@ -403,13 +401,7 @@ def _compare_eq_dict(
return explanation return explanation
def _compare_eq_cls( def _compare_eq_cls(left: Any, right: Any, verbose: int) -> List[str]:
left: Any,
right: Any,
verbose: int,
type_fns: Tuple[Callable[[Any], bool], Callable[[Any], bool]],
) -> List[str]:
isdatacls, isattrs = type_fns
if isdatacls(left): if isdatacls(left):
all_fields = left.__dataclass_fields__ all_fields = left.__dataclass_fields__
fields_to_check = [field for field, info in all_fields.items() if info.compare] fields_to_check = [field for field, info in all_fields.items() if info.compare]