Merged revisions 78116 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78116 | michael.foord | 2010-02-08 22:41:16 +0000 (Mon, 08 Feb 2010) | 1 line

  Make assertMultiLineEqual the default for comparing unicode strings.
........

2 files changed, 4 insertions, 2 deletions

diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index c944217..e5219fd 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -2795,8 +2795,9 @@ test case
         try:
             self.assertMultiLineEqual(sample_text, revised_sample_text)
         except self.failureException as e:
-            # no fair testing ourself with ourself, use assertEqual..
-            self.assertEqual(sample_text_error, str(e))
+            # no fair testing ourself with ourself, and assertEqual is used for strings
+            # so can't use assertEqual either. Just use assertTrue.
+            self.assertTrue(sample_text_error == str(e))
 
     def testAssertIsNone(self):
         self.assertIsNone(None)
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index a4e45aa..cf180d7 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -189,6 +189,7 @@ class TestCase(object):
         self.addTypeEqualityFunc(tuple, self.assertTupleEqual)
         self.addTypeEqualityFunc(set, self.assertSetEqual)
         self.addTypeEqualityFunc(frozenset, self.assertSetEqual)
+        self.addTypeEqualityFunc(str, self.assertMultiLineEqual)
 
     def addTypeEqualityFunc(self, typeobj, function):
         """Add a type specific assertEqual style function to compare a type.