ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

diff can now be a list

Browse source
This commit is contained in:
Brian Coca 2015-08-16 02:18:21 -04:00
parent 13c91ef9d4
commit c3372936aa
1 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/plugins/callback/__init__.py
View file

@ -72,7 +72,13 @@ class CallbackBase:
for warning in res['warnings']: for warning in res['warnings']:
self._display.warning(warning) self._display.warning(warning)
def _get_diff(self, diff): def _get_diff(self, difflist):
if not isinstance(difflist, list):
difflist = [difflist]
ret = []
for diff in difflist:
try: try:
with warnings.catch_warnings(): with warnings.catch_warnings():
warnings.simplefilter('ignore') warnings.simplefilter('ignore')
@ -95,11 +101,11 @@ class CallbackBase:
else: else:
after_header = 'after' after_header = 'after'
differ = difflib.unified_diff(to_unicode(diff['before']).splitlines(True), to_unicode(diff['after']).splitlines(True), before_header, after_header, '', '', 10) differ = difflib.unified_diff(to_unicode(diff['before']).splitlines(True), to_unicode(diff['after']).splitlines(True), before_header, after_header, '', '', 10)
for line in list(differ): ret.extend(list(differ))
ret.append(line) ret.append('\n')
return u"".join(ret) return u"".join(ret)
except UnicodeDecodeError: except UnicodeDecodeError:
return ">> the files are different, but the diff library cannot compare unicode strings" ret.append(">> the files are different, but the diff library cannot compare unicode strings\n\n")
def _process_items(self, result): def _process_items(self, result):