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.
........
This commit is contained in:
Michael Foord 2010-06-05 13:57:23 +00:00
parent 9dad32efe8
commit ac76074628
2 changed files with 7 additions and 4 deletions

View file

@ -936,7 +936,7 @@ class TestCase(object):
'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)