From e9c6e885fd828f2b6e991d8ccb5a73eed7e0d873 Mon Sep 17 00:00:00 2001 From: tedder Date: Thu, 10 Nov 2016 08:17:17 -0800 Subject: add .format indexes for 2.6 compatability Fixes #5551; the "".format() style needs to have `{0}` instead of the implied `{}` version for compatability with 2.6. --- cloud/amazon/cloudformation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud/amazon/cloudformation.py b/cloud/amazon/cloudformation.py index 0d02ad70..ee4481eb 100644 --- a/cloud/amazon/cloudformation.py +++ b/cloud/amazon/cloudformation.py @@ -257,11 +257,11 @@ def get_stack_events(cfn, stack_name): return ret for e in events.get('StackEvents', []): - eventline = 'StackEvent {} {} {}'.format(e['ResourceType'], e['LogicalResourceId'], e['ResourceStatus']) + eventline = 'StackEvent {0} {1} {2}'.format(e['ResourceType'], e['LogicalResourceId'], e['ResourceStatus']) ret['events'].append(eventline) if e['ResourceStatus'].endswith('FAILED'): - failline = '{} {} {}: {}'.format(e['ResourceType'], e['LogicalResourceId'], e['ResourceStatus'], e['ResourceStatusReason']) + failline = '{0} {1} {2}: {3}'.format(e['ResourceType'], e['LogicalResourceId'], e['ResourceStatus'], e['ResourceStatusReason']) ret['log'].append(failline) return ret -- cgit v1.2.1 From ef2f130591ec7217a93933c527f50b52b68af109 Mon Sep 17 00:00:00 2001 From: tedder Date: Fri, 18 Nov 2016 14:46:10 -0800 Subject: update formatted lines to use named identifiers --- cloud/amazon/cloudformation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud/amazon/cloudformation.py b/cloud/amazon/cloudformation.py index ee4481eb..724bf391 100644 --- a/cloud/amazon/cloudformation.py +++ b/cloud/amazon/cloudformation.py @@ -257,11 +257,11 @@ def get_stack_events(cfn, stack_name): return ret for e in events.get('StackEvents', []): - eventline = 'StackEvent {0} {1} {2}'.format(e['ResourceType'], e['LogicalResourceId'], e['ResourceStatus']) + eventline = 'StackEvent {ResourceType} {LogicalResourceId} {ResourceStatus}'.format(**e) ret['events'].append(eventline) if e['ResourceStatus'].endswith('FAILED'): - failline = '{0} {1} {2}: {3}'.format(e['ResourceType'], e['LogicalResourceId'], e['ResourceStatus'], e['ResourceStatusReason']) + failline = '{ResourceType} {LogicalResourceId} {ResourceStatus}: {ResourceStatusReason}'.format(**e) ret['log'].append(failline) return ret -- cgit v1.2.1