From 3e01516783a3fbfa35c695513a486a40d37db47f Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Tue, 1 Dec 2015 13:28:16 -0800 Subject: [PATCH] fixed signature for init on callbacks also removed passing display to base class which already handles this --- lib/ansible/plugins/callback/hipchat.py | 4 ++-- lib/ansible/plugins/callback/log_plays.py | 4 ++-- lib/ansible/plugins/callback/osx_say.py | 4 ++-- lib/ansible/plugins/callback/profile_tasks.py | 4 ++-- lib/ansible/plugins/callback/syslog_json.py | 4 ++-- lib/ansible/plugins/callback/timer.py | 4 ++-- lib/ansible/plugins/callback/tree.py | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/ansible/plugins/callback/hipchat.py b/lib/ansible/plugins/callback/hipchat.py index 5c2e3c60608..b31140128b0 100644 --- a/lib/ansible/plugins/callback/hipchat.py +++ b/lib/ansible/plugins/callback/hipchat.py @@ -50,9 +50,9 @@ class CallbackModule(CallbackBase): CALLBACK_NAME = 'hipchat' CALLBACK_NEEDS_WHITELIST = True - def __init__(self, display): + def __init__(self): - super(CallbackModule, self).__init__(display) + super(CallbackModule, self).__init__() if not HAS_PRETTYTABLE: self.disabled = True diff --git a/lib/ansible/plugins/callback/log_plays.py b/lib/ansible/plugins/callback/log_plays.py index 5d342a94f58..7b708a74baf 100644 --- a/lib/ansible/plugins/callback/log_plays.py +++ b/lib/ansible/plugins/callback/log_plays.py @@ -45,9 +45,9 @@ class CallbackModule(CallbackBase): TIME_FORMAT="%b %d %Y %H:%M:%S" MSG_FORMAT="%(now)s - %(category)s - %(data)s\n\n" - def __init__(self, display): + def __init__(self): - super(CallbackModule, self).__init__(display) + super(CallbackModule, self).__init__() if not os.path.exists("/var/log/ansible/hosts"): os.makedirs("/var/log/ansible/hosts") diff --git a/lib/ansible/plugins/callback/osx_say.py b/lib/ansible/plugins/callback/osx_say.py index da588434a83..24340778702 100644 --- a/lib/ansible/plugins/callback/osx_say.py +++ b/lib/ansible/plugins/callback/osx_say.py @@ -40,9 +40,9 @@ class CallbackModule(CallbackBase): CALLBACK_NAME = 'osx_say' CALLBACK_NEEDS_WHITELIST = True - def __init__(self, display): + def __init__(self): - super(CallbackModule, self).__init__(display) + super(CallbackModule, self).__init__() # plugin disable itself if say is not present # ansible will not call any callback if disabled is set to True diff --git a/lib/ansible/plugins/callback/profile_tasks.py b/lib/ansible/plugins/callback/profile_tasks.py index b23f84092b4..e4004c97d41 100644 --- a/lib/ansible/plugins/callback/profile_tasks.py +++ b/lib/ansible/plugins/callback/profile_tasks.py @@ -71,11 +71,11 @@ class CallbackModule(CallbackBase): CALLBACK_NAME = 'profile_tasks' CALLBACK_NEEDS_WHITELIST = True - def __init__(self, display): + def __init__(self): self.stats = {} self.current = None - super(CallbackModule, self).__init__(display) + super(CallbackModule, self).__init__() def _record_task(self, name): """ diff --git a/lib/ansible/plugins/callback/syslog_json.py b/lib/ansible/plugins/callback/syslog_json.py index 6ba9c6f3cda..6b5fc60bdcc 100644 --- a/lib/ansible/plugins/callback/syslog_json.py +++ b/lib/ansible/plugins/callback/syslog_json.py @@ -28,9 +28,9 @@ class CallbackModule(CallbackBase): CALLBACK_NAME = 'syslog_json' CALLBACK_NEEDS_WHITELIST = True - def __init__(self, display): + def __init__(self): - super(CallbackModule, self).__init__(display) + super(CallbackModule, self).__init__() self.logger = logging.getLogger('ansible logger') self.logger.setLevel(logging.DEBUG) diff --git a/lib/ansible/plugins/callback/timer.py b/lib/ansible/plugins/callback/timer.py index 9d976ea18d5..0c9829aea2b 100644 --- a/lib/ansible/plugins/callback/timer.py +++ b/lib/ansible/plugins/callback/timer.py @@ -16,9 +16,9 @@ class CallbackModule(CallbackBase): CALLBACK_NAME = 'timer' CALLBACK_NEEDS_WHITELIST = True - def __init__(self, display): + def __init__(self): - super(CallbackModule, self).__init__(display) + super(CallbackModule, self).__init__() self.start_time = datetime.now() diff --git a/lib/ansible/plugins/callback/tree.py b/lib/ansible/plugins/callback/tree.py index 5c976cc6f21..8b1118864ec 100644 --- a/lib/ansible/plugins/callback/tree.py +++ b/lib/ansible/plugins/callback/tree.py @@ -36,8 +36,8 @@ class CallbackModule(CallbackBase): CALLBACK_NAME = 'tree' CALLBACK_NEEDS_WHITELIST = True - def __init__(self, display): - super(CallbackModule, self).__init__(display) + def __init__(self): + super(CallbackModule, self).__init__() self.tree = TREE_DIR if not self.tree: