Fix diff output vertical spacing

12 years ago · 9f2bba01ba
parent a875b63703
commit 9f2bba01ba
1 changed files with 2 additions and 2 deletions
--- a/lib/ansible/utils/init.py
+++ b/lib/ansible/utils/init.py
@ -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"