internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finish up plugin porting to global display

Browse Source 
Also remove display = display which does nothing
This commit is contained in:
Toshio Kuratomi
2015-11-11 10:19:58 -08:00
parent 2bd695ed42
commit 62979efa14
39 changed files with 68 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ansible/executor/task_queue_manager.py
View File

@@ -35,7 +35,6 @@ from ansible.template import Templar
try:
from __main__ import display
display = display
except ImportError:
from ansible.utils.display import Display
display = Display()
@@ -161,11 +160,7 @@ class TaskQueueManager:
elif callback_needs_whitelist and (C.DEFAULT_CALLBACK_WHITELIST is None or callback_name not in C.DEFAULT_CALLBACK_WHITELIST):
continue
# is it too late to change the API for v2 callback plugins?
# display is not necessary.
self._callback_plugins.append(callback_plugin(display))
else:
self._callback_plugins.append(callback_plugin())
self._callback_plugins.append(callback_plugin())
self._callbacks_loaded = True