ec2_vpc_route_tables - Remove more dict comprehensions.

reviewable/pr18780/r1
Robert Estelle 10 years ago committed by whiter
parent f0a4be1b4b
commit 17ed722d55

@ -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)

Loading…
Cancel
Save