From ac6b7045dbc45b7d6f42bf46a2df3a6c9a8c1aaf Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Thu, 2 Apr 2015 11:09:44 -0700 Subject: [PATCH] A little py3 compat, side effect of making this work under profile --- v2/bin/ansible-playbook | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/v2/bin/ansible-playbook b/v2/bin/ansible-playbook index f1b590958b3..8e80966ed7f 100755 --- a/v2/bin/ansible-playbook +++ b/v2/bin/ansible-playbook @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import print_function import os import stat @@ -19,7 +20,8 @@ from ansible.utils.vault import read_vault_file from ansible.vars import VariableManager # Implement an ansible.utils.warning() function later -warning = getattr(__builtins__, 'print') +def warning(*args, **kwargs): + print(*args, **kwargs) #--------------------------------------------------------------------------------------------------- @@ -136,10 +138,10 @@ if __name__ == "__main__": sys.exit(main(sys.argv[1:])) except AnsibleError, e: #display("ERROR: %s" % e, color='red', stderr=True) - print e + print(e) sys.exit(1) except KeyboardInterrupt, ke: #display("ERROR: interrupted", color='red', stderr=True) - print "keyboard interrupt" + print("keyboard interrupt") sys.exit(1)