From 4e99c80425024dfcf733e060c5ce9c53ff49c475 Mon Sep 17 00:00:00 2001 From: Aly Sivji Date: Mon, 12 Nov 2018 11:24:15 -0600 Subject: [PATCH] have tests pass in python37; move to separate file --- src/_pytest/assertion/util.py | 8 ++++---- testing/test_assertion.py | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/_pytest/assertion/util.py b/src/_pytest/assertion/util.py index 9984b5120..4e10a3fbb 100644 --- a/src/_pytest/assertion/util.py +++ b/src/_pytest/assertion/util.py @@ -343,16 +343,16 @@ def _compare_eq_cls(left, right, verbose, type_fns): explanation = [] if same and verbose < 2: - explanation += [u("Omitting %s identical items, use -vv to show") % len(same)] + explanation.append(u"Omitting %s identical items, use -vv to show" % len(same)) elif same: - explanation += [u("Common attributes:")] + explanation += [u"Common attributes:"] explanation += pprint.pformat(same).splitlines() if diff: class_name = left.__class__.__name__ - explanation += [("Differing attributes:")] + explanation += [u"Differing attributes:"] for k in diff: explanation += [ - u("%s(%s=%r) != %s(%s=%r)") + (u"%s(%s=%r) != %s(%s=%r)") % (class_name, k, getattr(left, k), class_name, k, getattr(right, k)) ] return explanation diff --git a/testing/test_assertion.py b/testing/test_assertion.py index fdcfccfed..4a09187b7 100644 --- a/testing/test_assertion.py +++ b/testing/test_assertion.py @@ -556,8 +556,8 @@ class TestAssert_reprcompare_dataclass(object): @dataclass class SimpleDataObject(object): - field_a = field() - field_b = field() + field_a: int = field() + field_b: int = field() left = SimpleDataObject(1, "b") right = SimpleDataObject(1, "c") @@ -574,8 +574,8 @@ class TestAssert_reprcompare_dataclass(object): @dataclass class SimpleDataObject(object): - field_a = field() - field_b = field() + field_a: int = field() + field_b: int = field() left = SimpleDataObject(1, "b") right = SimpleDataObject(1, "c") @@ -591,8 +591,8 @@ class TestAssert_reprcompare_dataclass(object): @dataclass class SimpleDataObject(object): - field_a = field() - field_b = field(compare=False) + field_a: int = field() + field_b: int = field(compare=False) left = SimpleDataObject(1, "b") right = SimpleDataObject(1, "b") @@ -610,13 +610,13 @@ class TestAssert_reprcompare_dataclass(object): @dataclass class SimpleDataObjectOne(object): - field_a = field() - field_b = field() + field_a: int = field() + field_b: int = field() @dataclass class SimpleDataObjectTwo(object): - field_a = field() - field_b = field() + field_a: int = field() + field_b: int = field() left = SimpleDataObjectOne(1, "b") right = SimpleDataObjectTwo(1, "c")