From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Sat, 5 Jun 2010 11:46:59 +0000 (+0000)
Subject: Extract error message truncating into a method (unittest.TestCase._truncateMessage).
X-Git-Tag: v2.7rc1~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a441287f79ac793a0fe046b85f2e5e12364c6a84;p=thirdparty%2FPython%2Fcpython.git

Extract error message truncating into a method (unittest.TestCase._truncateMessage).
---

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 7608e301394c..de589685c3f4 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -690,13 +690,15 @@ class TestCase(object):
         diffMsg = '\n' + '\n'.join(
             difflib.ndiff(pprint.pformat(seq1).splitlines(),
                           pprint.pformat(seq2).splitlines()))
-        if max_diff is None or len(diffMsg) <= max_diff:
-            standardMsg += diffMsg
-        else:
-            standardMsg += diffMsg[:max_diff] + TRUNCATED_DIFF
+        standardMsg = self._truncateMessage(standardMsg, diffMsg, max_diff)
         msg = self._formatMessage(msg, standardMsg)
         self.fail(msg)
 
+    def _truncateMessage(self, message, diff, max_diff):
+        if max_diff is None or len(diff) <= max_diff:
+            return message + diff
+        return message + diff[:max_diff] + TRUNCATED_DIFF
+
     def assertListEqual(self, list1, list2, msg=None):
         """A list-specific equality assertion.