commit ac76074628b0a3aea78cc85c79034bb7d04b68f4
author Michael Foord <fuzzyman@voidspace.org.uk> Sat Jun 05 13:57:23 2010 +0000
committer Michael Foord <fuzzyman@voidspace.org.uk> Sat Jun 05 13:57:23 2010 +0000
tree 8b73eb5504a859366fbaac46ba041ab079055d77
parent 9dad32efe8e63cda4de3b53004598d2c1f6aa129

Merged revisions 81753 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81753 | michael.foord | 2010-06-05 14:48:27 +0100 (Sat, 05 Jun 2010) | 1 line

  Fix unittest tests after previous commit.
........

Lib/unittest/case.py

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index fcb756d..3a87a2f 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -936,7 +936,7 @@
                 'Second argument is not a string'))
 
         if first != second:
-            standardMsg = '%s != %s' % (safe_repr(d1, True), safe_repr(d2, True))
+            standardMsg = '%s != %s' % (safe_repr(first, True), safe_repr(second, True))
             diff = '\n' + ''.join(difflib.ndiff(first.splitlines(True),
                                                        second.splitlines(True)))
             standardMsg = self._truncateMessage(standardMsg, diff)