summaryrefslogtreecommitdiffstats
path: root/Lib/unittest/case.py
diff options
context:
space:
mode:
authorMichael Foord <fuzzyman@voidspace.org.uk>2010-06-05 13:57:23 (GMT)
committerMichael Foord <fuzzyman@voidspace.org.uk>2010-06-05 13:57:23 (GMT)
commitac76074628b0a3aea78cc85c79034bb7d04b68f4 (patch)
tree8b73eb5504a859366fbaac46ba041ab079055d77 /Lib/unittest/case.py
parent9dad32efe8e63cda4de3b53004598d2c1f6aa129 (diff)
downloadcpython-ac76074628b0a3aea78cc85c79034bb7d04b68f4.zip
cpython-ac76074628b0a3aea78cc85c79034bb7d04b68f4.tar.gz
cpython-ac76074628b0a3aea78cc85c79034bb7d04b68f4.tar.bz2
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. ........
Diffstat (limited to 'Lib/unittest/case.py')
-rw-r--r--Lib/unittest/case.py2
1 files changed, 1 insertions, 1 deletions
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 @@ 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)