Make assertMultiLineEqual the default for comparing unicode strings.
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index 04a7322..0f39085 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -2810,8 +2810,9 @@
self.assertMultiLineEqual(type_changer(sample_text),
type_changer(revised_sample_text))
except self.failureException, e:
- # no fair testing ourself with ourself, use assertEqual..
- self.assertEqual(sample_text_error, str(e).encode('utf8'))
+ # assertMultiLineEqual is hooked up as the default for
+ # unicode strings - so we can't use it for this check
+ self.assertTrue(sample_text_error == str(e).encode('utf8'))
def testAssertIsNone(self):
self.assertIsNone(None)
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index f3c2844..e8ebc90 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -176,6 +176,7 @@
self.addTypeEqualityFunc(tuple, self.assertTupleEqual)
self.addTypeEqualityFunc(set, self.assertSetEqual)
self.addTypeEqualityFunc(frozenset, self.assertSetEqual)
+ self.addTypeEqualityFunc(unicode, self.assertMultiLineEqual)
def addTypeEqualityFunc(self, typeobj, function):
"""Add a type specific assertEqual style function to compare a type.