merge from master again

2016-06-22 16:03:52 +02:00
parent e96cd51a2a f7585c7549
commit 18ef7de96b
6 changed files with 43 additions and 5 deletions
--- a/_pytest/assertion/util.py
+++ b/_pytest/assertion/util.py
@@ -225,9 +225,10 @@ def _diff_text(left, right, verbose=False):
                                  'characters in diff, use -v to show') % i]
                left = left[:-i]
                right = right[:-i]
+    keepends = True
    explanation += [line.strip('\n')
-                    for line in ndiff(left.splitlines(),
-                                      right.splitlines())]
+                    for line in ndiff(left.splitlines(keepends),
+                                      right.splitlines(keepends))]
    return explanation