Fix diff output vertical spacing

pull/2159/head
Stoned Elipot 12 years ago
parent a875b63703
commit 9f2bba01ba

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

Loading…
Cancel
Save