From a4b8cdf8b334e63f7e3deb36ac9d18e928f88455 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Sun, 18 Mar 2012 17:32:36 -0400 Subject: [PATCH] Remove "import *"'s from bin/ansible-playbook code so pyflakes will be usable. --- bin/ansible-playbook | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/bin/ansible-playbook b/bin/ansible-playbook index 114201b8b5..562e0fe89b 100755 --- a/bin/ansible-playbook +++ b/bin/ansible-playbook @@ -19,13 +19,14 @@ ####################################################### import sys -import ansible.playbook -import ansible.constants as C -from ansible.utils import * -from ansible.errors import * import getpass from optparse import OptionParser +import ansible.playbook +import ansible.constants as C +from ansible import errors +from ansible import utils + ####################################################### class PlaybookCallbacks(object): @@ -40,13 +41,13 @@ class PlaybookCallbacks(object): print "\n" def on_task_start(self, name, is_conditional): - print task_start_msg(name, is_conditional) + print utils.task_start_msg(name, is_conditional) def on_unreachable(self, host, msg): print "unreachable: [%s] => %s" % (host, msg) def on_failed(self, host, results): - print "failed: [%s] => %s\n" % (host, smjson(results)) + print "failed: [%s] => %s\n" % (host, utils.smjson(results)) def on_ok(self, host): print "ok: [%s]\n" % (host) @@ -58,7 +59,7 @@ class PlaybookCallbacks(object): print msg def on_async_poll(self, jid, host, clock, host_result): - print async_poll_status(jid, host, clock, host_result) + print utils.async_poll_status(jid, host, clock, host_result) def on_dark_host(self, host, msg): print "exception: [%s] => %s" % (host, msg) @@ -105,7 +106,7 @@ def main(args): ) try: pb.run() - except AnsibleError as e: + except errors.AnsibleError as e: print >>sys.stderr, "ERROR: %s" % e return 1