summaryrefslogtreecommitdiff
path: root/src/_pytest
diff options
context:
space:
mode:
authorRan Benita <ran@unusedvar.com>2020-10-30 21:15:48 +0200
committerRan Benita <ran@unusedvar.com>2020-10-30 21:15:48 +0200
commit5913cd20ec7c3f0a8305aa072110da5c896fddb8 (patch)
tree011a537870572ed43e96ca7f9ded5646d4cd4812 /src/_pytest
parent0cd190f037007bfdc43501c19f7e7a280e19b96c (diff)
downloadpytest-5913cd20ec7c3f0a8305aa072110da5c896fddb8.tar.gz
assertion/util: remove unhelpful `type_fns` indirection
It doesn't serve any purpose that I am able to discern.
Diffstat (limited to 'src/_pytest')
-rw-r--r--src/_pytest/assertion/util.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/_pytest/assertion/util.py b/src/_pytest/assertion/util.py
index 08ff4eacd..93fa48b8e 100644
--- a/src/_pytest/assertion/util.py
+++ b/src/_pytest/assertion/util.py
@@ -9,7 +9,6 @@ from typing import List
from typing import Mapping
from typing import Optional
from typing import Sequence
-from typing import Tuple
import _pytest._code
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):
explanation = _compare_eq_dict(left, right, verbose)
elif type(left) == type(right) and (isdatacls(left) or isattrs(left)):
- type_fn = (isdatacls, isattrs)
- explanation = _compare_eq_cls(left, right, verbose, type_fn)
+ explanation = _compare_eq_cls(left, right, verbose)
elif verbose > 0:
explanation = _compare_eq_verbose(left, right)
if isiterable(left) and isiterable(right):
@@ -403,13 +401,7 @@ def _compare_eq_dict(
return explanation
-def _compare_eq_cls(
- left: Any,
- right: Any,
- verbose: int,
- type_fns: Tuple[Callable[[Any], bool], Callable[[Any], bool]],
-) -> List[str]:
- isdatacls, isattrs = type_fns
+def _compare_eq_cls(left: Any, right: Any, verbose: int) -> List[str]:
if isdatacls(left):
all_fields = left.__dataclass_fields__
fields_to_check = [field for field, info in all_fields.items() if info.compare]