From 395093e0bf8b6c23f234df3a7168961be3934510 Mon Sep 17 00:00:00 2001 From: Rodney Quillo Date: Sat, 19 Jan 2013 08:34:47 +0800 Subject: [PATCH] Move default arguments to the end of the function call. --- lib/ansible/callback_plugins/noop.py | 2 +- lib/ansible/callbacks.py | 6 +++--- lib/ansible/playbook/play.py | 4 ++-- plugins/callbacks/log_plays.py | 2 +- plugins/callbacks/osx_say.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/ansible/callback_plugins/noop.py b/lib/ansible/callback_plugins/noop.py index a41ed741156..b0f48ef47fb 100644 --- a/lib/ansible/callback_plugins/noop.py +++ b/lib/ansible/callback_plugins/noop.py @@ -72,7 +72,7 @@ class CallbackModule(object): def playbook_on_task_start(self, name, is_conditional): pass - def playbook_on_vars_prompt(self, varname, default=None, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None): + def playbook_on_vars_prompt(self, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None, default=None): pass def playbook_on_setup(self): diff --git a/lib/ansible/callbacks.py b/lib/ansible/callbacks.py index 2b04a237602..619613fb333 100644 --- a/lib/ansible/callbacks.py +++ b/lib/ansible/callbacks.py @@ -435,7 +435,7 @@ class PlaybookCallbacks(object): print banner(msg) call_callback_module('playbook_on_task_start', name, is_conditional) - def on_vars_prompt(self, varname, default=None, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None): + def on_vars_prompt(self, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None, default=None): if prompt: msg = "%s: " % prompt @@ -466,8 +466,8 @@ class PlaybookCallbacks(object): if encrypt: result = utils.do_encrypt(result,encrypt,salt_size,salt) - call_callback_module( 'playbook_on_vars_prompt', varname, default=default, private=private, - prompt=prompt, encrypt=encrypt, confirm=confirm, salt_size=salt_size, salt=None + call_callback_module( 'playbook_on_vars_prompt', varname, private=private, prompt=prompt, + encrypt=encrypt, confirm=confirm, salt_size=salt_size, salt=None, default=default ) return result diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py index dcf9f5ffea4..f678a15bb78 100644 --- a/lib/ansible/playbook/play.py +++ b/lib/ansible/playbook/play.py @@ -199,7 +199,7 @@ class Play(object): if vname not in self.playbook.extra_vars: vars[vname] = self.playbook.callbacks.on_vars_prompt ( - vname, default, private, prompt, encrypt, confirm, salt_size, salt + vname, private, prompt, encrypt, confirm, salt_size, salt, default ) elif type(self.vars_prompt) == dict: @@ -207,7 +207,7 @@ class Play(object): prompt_msg = "%s: " % prompt if vname not in self.playbook.extra_vars: vars[vname] = self.playbook.callbacks.on_vars_prompt( - varname=vname, default=None, private=False, prompt=prompt_msg + varname=vname, private=False, prompt=prompt_msg, default=None ) else: diff --git a/plugins/callbacks/log_plays.py b/plugins/callbacks/log_plays.py index 440ff78df5d..3931b3411b2 100644 --- a/plugins/callbacks/log_plays.py +++ b/plugins/callbacks/log_plays.py @@ -86,7 +86,7 @@ class CallbackModule(object): def playbook_on_task_start(self, name, is_conditional): pass - def playbook_on_vars_prompt(self, varname, default=None, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None): + def playbook_on_vars_prompt(self, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None, default=None): pass def playbook_on_setup(self): diff --git a/plugins/callbacks/osx_say.py b/plugins/callbacks/osx_say.py index b506d2dbe3a..89c82ca5304 100644 --- a/plugins/callbacks/osx_say.py +++ b/plugins/callbacks/osx_say.py @@ -73,7 +73,7 @@ class CallbackModule(object): else: say("Notifying task: %s" % name, REGULAR_VOICE) - def playbook_on_vars_prompt(self, varname, default=None, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None): + def playbook_on_vars_prompt(self, varname, private=True, prompt=None, encrypt=None, confirm=False, salt_size=None, salt=None, default=None): pass def playbook_on_setup(self):