From 9aaddd5b48f8ce83591e7bba8a9141f98a65a60f Mon Sep 17 00:00:00 2001 From: Chang Bo Guo Date: Wed, 18 Sep 2013 00:56:48 -0700 Subject: [PATCH] Use built-in print() instead of print statement In python 3 print statement is not supported, so we should use only print() functions. Fixes bug 1226943 Change-Id: If88d77982ddbd1eb47265f15a27b747cd8011e76 --- tools/cfn-json2yaml | 6 +++--- tools/experimental_ssh_eventlet.py | 4 ++-- tools/install_venv.py | 2 +- tools/state_transitions.py | 14 +++++++------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/cfn-json2yaml b/tools/cfn-json2yaml index fd855956af..54de9ddb98 100755 --- a/tools/cfn-json2yaml +++ b/tools/cfn-json2yaml @@ -28,18 +28,18 @@ def main(): elif os.path.isfile(path): convert_file(path) else: - print 'File or directory not valid: %s' % path + print('File or directory not valid: %s' % path) def convert_file(path): f = open(path, 'r') - print template_format.convert_json_to_yaml(f.read()) + print(template_format.convert_json_to_yaml(f.read())) def convert_directory(dirpath): for path in os.listdir(dirpath): if not path.endswith('.template') and not path.endswith('.json'): continue yamlpath = re.sub('\..*$', '.yaml', path) - print 'Writing to %s' % yamlpath + print('Writing to %s' % yamlpath) f = open(os.path.join(dirpath, path), 'r') out = open(os.path.join(dirpath, yamlpath), 'w') yml = template_format.convert_json_to_yaml(f.read()) diff --git a/tools/experimental_ssh_eventlet.py b/tools/experimental_ssh_eventlet.py index eece3ead31..d4d5e66ca7 100755 --- a/tools/experimental_ssh_eventlet.py +++ b/tools/experimental_ssh_eventlet.py @@ -9,7 +9,7 @@ import random def monitor(hostname, username, id): - print '%s %s %d' % (hostname, username, id) + print('%s %s %d' % (hostname, username, id)) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock.connect((hostname, 22)) @@ -45,7 +45,7 @@ def monitor(hostname, username, id): #if data: # stderr.append(data) - print '%d %d %s' % (id, sl, ''.join(stdout)) + print('%d %d %s' % (id, sl, ''.join(stdout))) #print ''.join(stderr) diff --git a/tools/install_venv.py b/tools/install_venv.py index 104dd42acc..d4cf4d6a94 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -44,7 +44,7 @@ def print_help(venv, root): Also, make test will automatically use the virtualenv. """ - print help % (venv, root) + print(help % (venv, root)) def main(argv): diff --git a/tools/state_transitions.py b/tools/state_transitions.py index 355e3194c5..c03ef08dfe 100755 --- a/tools/state_transitions.py +++ b/tools/state_transitions.py @@ -23,19 +23,19 @@ actions = resource.Resource.ACTIONS stack_statuses = resource.Resource.STATUSES engine_statuses = ("Alive", "Dead") -print """\ +print("""\ | Orig action | Stack status | Engine status | New action | Behavior | |-------------+--------------+---------------+------------+------------------|\ -""" +""") for orig_action in actions: for stack_status in stack_statuses: for new_action in actions: if stack_status == resource.Resource.IN_PROGRESS: for engine_status in engine_statuses: - print "| %11s | %12s | %13s | %10s | |" \ - % (orig_action, stack_status, engine_status, - new_action) + print("| %11s | %12s | %13s | %10s | |" \ + % (orig_action, stack_status, engine_status, + new_action)) else: - print "| %11s | %12s | %13s | %10s | |" \ - % (orig_action, stack_status, "NA", new_action) + print("| %11s | %12s | %13s | %10s | |" \ + % (orig_action, stack_status, "NA", new_action))