diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-09-28 10:48:40 -0400 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-09-28 10:48:40 -0400 |
| commit | e56717c3d201db2dadacd20f654d6be7f9ed18ed (patch) | |
| tree | e0df9e7bf6ab16052edaa32311ab66278bc73404 /Lib/unittest/case.py | |
| parent | 19f6260710b3d086abcbe400194b203be11b60ab (diff) | |
| parent | d8b509b192a67f0f217ae52ed81fc91bc27a1818 (diff) | |
| download | cpython-git-e56717c3d201db2dadacd20f654d6be7f9ed18ed.tar.gz | |
merge heads
Diffstat (limited to 'Lib/unittest/case.py')
| -rw-r--r-- | Lib/unittest/case.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py index d82fa20927..cc5f0c397c 100644 --- a/Lib/unittest/case.py +++ b/Lib/unittest/case.py @@ -1010,8 +1010,8 @@ class TestCase(object): if (len(first) > self._diffThreshold or len(second) > self._diffThreshold): self._baseAssertEqual(first, second, msg) - firstlines = first.splitlines(True) - secondlines = second.splitlines(True) + firstlines = first.splitlines(keepends=True) + secondlines = second.splitlines(keepends=True) if len(firstlines) == 1 and first.strip('\r\n') == first: firstlines = [first + '\n'] secondlines = [second + '\n'] |