openstack/deb-heat
Code Issues Proposed changes

Use built-in print() instead of print statement

Browse Source 
In python 3 print statement is not supported, so we should use
only print() functions.

Fixes bug 1226943

Change-Id: If88d77982ddbd1eb47265f15a27b747cd8011e76
This commit is contained in:
Chang Bo Guo 2013-09-18 00:56:48 -07:00
parent 6370a8790e
commit 9aaddd5b48
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/cfn-json2yaml
View File

@ -28,18 +28,18 @@ def main():
elif os.path.isfile(path): elif os.path.isfile(path):
convert_file(path) convert_file(path)
else: else:
print 'File or directory not valid: %s' % path print('File or directory not valid: %s' % path)
def convert_file(path): def convert_file(path):
f = open(path, 'r') 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): def convert_directory(dirpath):
for path in os.listdir(dirpath): for path in os.listdir(dirpath):
if not path.endswith('.template') and not path.endswith('.json'): if not path.endswith('.template') and not path.endswith('.json'):
continue continue
yamlpath = re.sub('\..*$', '.yaml', path) yamlpath = re.sub('\..*$', '.yaml', path)
print 'Writing to %s' % yamlpath print('Writing to %s' % yamlpath)
f = open(os.path.join(dirpath, path), 'r') f = open(os.path.join(dirpath, path), 'r')
out = open(os.path.join(dirpath, yamlpath), 'w') out = open(os.path.join(dirpath, yamlpath), 'w')
yml = template_format.convert_json_to_yaml(f.read()) yml = template_format.convert_json_to_yaml(f.read())

4
tools/experimental_ssh_eventlet.py
View File

@ -9,7 +9,7 @@ import random
def monitor(hostname, username, id): 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 = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.connect((hostname, 22)) sock.connect((hostname, 22))
@ -45,7 +45,7 @@ def monitor(hostname, username, id):
#if data: #if data:
# stderr.append(data) # stderr.append(data)
print '%d %d %s' % (id, sl, ''.join(stdout)) print('%d %d %s' % (id, sl, ''.join(stdout)))
#print ''.join(stderr) #print ''.join(stderr)

2
tools/install_venv.py
View File

@ -44,7 +44,7 @@ def print_help(venv, root):
Also, make test will automatically use the virtualenv. Also, make test will automatically use the virtualenv.
""" """
print help % (venv, root) print(help % (venv, root))
def main(argv): def main(argv):

12
tools/state_transitions.py
View File

@ -23,19 +23,19 @@ actions = resource.Resource.ACTIONS
stack_statuses = resource.Resource.STATUSES stack_statuses = resource.Resource.STATUSES
engine_statuses = ("Alive", "Dead") engine_statuses = ("Alive", "Dead")
print """\ print("""\
| Orig action | Stack status | Engine status | New action | Behavior | | Orig action | Stack status | Engine status | New action | Behavior |
|-------------+--------------+---------------+------------+------------------|\ |-------------+--------------+---------------+------------+------------------|\
""" """)
for orig_action in actions: for orig_action in actions:
for stack_status in stack_statuses: for stack_status in stack_statuses:
for new_action in actions: for new_action in actions:
if stack_status == resource.Resource.IN_PROGRESS: if stack_status == resource.Resource.IN_PROGRESS:
for engine_status in engine_statuses: for engine_status in engine_statuses:
print "| %11s | %12s | %13s | %10s | |" \ print("| %11s | %12s | %13s | %10s | |" \
% (orig_action, stack_status, engine_status, % (orig_action, stack_status, engine_status,
new_action) new_action))
else: else:
print "| %11s | %12s | %13s | %10s | |" \ print("| %11s | %12s | %13s | %10s | |" \
% (orig_action, stack_status, "NA", new_action) % (orig_action, stack_status, "NA", new_action))