From 97bae969cf7aff7a550a1590ef9ef46b54465b03 Mon Sep 17 00:00:00 2001
From: Robert Estelle <robert@getpreo.com>
Date: Thu, 4 Dec 2014 22:10:02 -0500
Subject: [PATCH] ec2_vpc_route_tables - Remove more dict comprehensions.
---
.../modules/extras/cloud/amazon/ec2_vpc_route_table.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_route_table.py b/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_route_table.py
index b6fda27b703..af28ef341cc 100644
--- a/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_route_table.py
+++ b/lib/ansible/modules/extras/cloud/amazon/ec2_vpc_route_table.py
@@ -172,8 +172,8 @@ class AnsibleTagCreationException(AnsibleRouteTableException):
def get_resource_tags(vpc_conn, resource_id):
- return {t.name: t.value for t in
- vpc_conn.get_all_tags(filters={'resource-id': resource_id})}
+ return dict((t.name, t.value) for t in
+ vpc_conn.get_all_tags(filters={'resource-id': resource_id}))
def tags_match(match_tags, candidate_tags):
@@ -187,11 +187,11 @@ def ensure_tags(vpc_conn, resource_id, tags, add_only, check_mode):
if tags == cur_tags:
return {'changed': False, 'tags': cur_tags}
- to_delete = {k: cur_tags[k] for k in cur_tags if k not in tags}
+ to_delete = dict((k, cur_tags[k]) for k in cur_tags if k not in tags)
if to_delete and not add_only:
vpc_conn.delete_tags(resource_id, to_delete, dry_run=check_mode)
- to_add = {k: tags[k] for k in tags if k not in cur_tags}
+ to_add = dict((k, tags[k]) for k in tags if k not in cur_tags)
if to_add:
vpc_conn.create_tags(resource_id, to_add, dry_run=check_mode)