Merge pull request #2159 from stoned/diff-output

Fix diff output vertical spacing
pull/2170/head
Daniel Hokka Zakrisson 12 years ago
commit 2225ee4b85

@ -627,8 +627,8 @@ def get_diff(before, after):
try:
with warnings.catch_warnings():
warnings.simplefilter('ignore')
differ = difflib.unified_diff(before.split("\n"), after.split("\n"), 'before', 'after', '', '', 10)
return "\n".join(list(differ))
differ = difflib.unified_diff(before.splitlines(True), after.splitlines(True), 'before', 'after', '', '', 10)
return "".join(list(differ))
except UnicodeDecodeError:
return ">> the files are different, but the diff library cannot compare unicode strings"

Loading…
Cancel
Save