Kaydet (Commit) d4442ae5 authored tarafından Serhiy Storchaka's avatar Serhiy Storchaka

Issue #26837: assertSequenceEqual() now correctly outputs non-stringified

differing items.  This affects assertListEqual() and assertTupleEqual().
üst 0207e769
...@@ -689,7 +689,7 @@ class TestCase(object): ...@@ -689,7 +689,7 @@ class TestCase(object):
if item1 != item2: if item1 != item2:
differing += ('\nFirst differing element %d:\n%s\n%s\n' % differing += ('\nFirst differing element %d:\n%s\n%s\n' %
(i, item1, item2)) (i, safe_repr(item1), safe_repr(item2)))
break break
else: else:
if (len1 == len2 and seq_type is None and if (len1 == len2 and seq_type is None and
...@@ -702,7 +702,7 @@ class TestCase(object): ...@@ -702,7 +702,7 @@ class TestCase(object):
'elements.\n' % (seq_type_name, len1 - len2)) 'elements.\n' % (seq_type_name, len1 - len2))
try: try:
differing += ('First extra element %d:\n%s\n' % differing += ('First extra element %d:\n%s\n' %
(len2, seq1[len2])) (len2, safe_repr(seq1[len2])))
except (TypeError, IndexError, NotImplementedError): except (TypeError, IndexError, NotImplementedError):
differing += ('Unable to index element %d ' differing += ('Unable to index element %d '
'of first %s\n' % (len2, seq_type_name)) 'of first %s\n' % (len2, seq_type_name))
...@@ -711,7 +711,7 @@ class TestCase(object): ...@@ -711,7 +711,7 @@ class TestCase(object):
'elements.\n' % (seq_type_name, len2 - len1)) 'elements.\n' % (seq_type_name, len2 - len1))
try: try:
differing += ('First extra element %d:\n%s\n' % differing += ('First extra element %d:\n%s\n' %
(len1, seq2[len1])) (len1, safe_repr(seq2[len1])))
except (TypeError, IndexError, NotImplementedError): except (TypeError, IndexError, NotImplementedError):
differing += ('Unable to index element %d ' differing += ('Unable to index element %d '
'of second %s\n' % (len1, seq_type_name)) 'of second %s\n' % (len1, seq_type_name))
......
...@@ -77,6 +77,9 @@ Core and Builtins ...@@ -77,6 +77,9 @@ Core and Builtins
Library Library
------- -------
- Issue #26837: assertSequenceEqual() now correctly outputs non-stringified
differing items. This affects assertListEqual() and assertTupleEqual().
- Issue #26822: itemgetter, attrgetter and methodcaller objects no longer - Issue #26822: itemgetter, attrgetter and methodcaller objects no longer
silently ignore keyword arguments. silently ignore keyword arguments.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment