internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 13:52:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed dict.iteritems() in modules. (#18859)

Browse Source 
This is for py3 compatibility, addressed in #18506
This commit is contained in:
Andrea Tartaglia
2016-12-12 23:16:23 +00:00
committed by Toshio Kuratomi
parent 4b27d08643
commit ef391a11ec
99 changed files with 251 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/ansible/modules/cloud/amazon/dynamodb_table.py
View File

@@ -274,14 +274,14 @@ def update_dynamo_table(table, throughput=None, check_mode=False, global_indexes
removed_indexes, added_indexes, index_throughput_changes = get_changed_global_indexes(table, global_indexes)
if removed_indexes:
if not check_mode:
for name, index in removed_indexes.iteritems():
for name, index in removed_indexes.items():
global_indexes_changed = table.delete_global_secondary_index(name) or global_indexes_changed
else:
global_indexes_changed = True
if added_indexes:
if not check_mode:
for name, index in added_indexes.iteritems():
for name, index in added_indexes.items():
global_indexes_changed = table.create_global_secondary_index(global_index=index) or global_indexes_changed
else:
global_indexes_changed = True
@@ -328,18 +328,18 @@ def get_changed_global_indexes(table, global_indexes):
set_index_info = dict((index.name, index.schema()) for index in global_indexes)
set_index_objects = dict((index.name, index) for index in global_indexes)
removed_indexes = dict((name, index) for name, index in table_index_info.iteritems() if name not in set_index_info)
added_indexes = dict((name, set_index_objects[name]) for name, index in set_index_info.iteritems() if name not in table_index_info)
removed_indexes = dict((name, index) for name, index in table_index_info.items() if name not in set_index_info)
added_indexes = dict((name, set_index_objects[name]) for name, index in set_index_info.items() if name not in table_index_info)
# todo: uncomment once boto has https://github.com/boto/boto/pull/3447 fixed
# index_throughput_changes = dict((name, index.throughput) for name, index in set_index_objects.iteritems() if name not in added_indexes and (index.throughput['read'] != str(table_index_objects[name].throughput['read']) or index.throughput['write'] != str(table_index_objects[name].throughput['write'])))
# index_throughput_changes = dict((name, index.throughput) for name, index in set_index_objects.items() if name not in added_indexes and (index.throughput['read'] != str(table_index_objects[name].throughput['read']) or index.throughput['write'] != str(table_index_objects[name].throughput['write'])))
# todo: remove once boto has https://github.com/boto/boto/pull/3447 fixed
index_throughput_changes = dict((name, index.throughput) for name, index in set_index_objects.iteritems() if name not in added_indexes)
index_throughput_changes = dict((name, index.throughput) for name, index in set_index_objects.items() if name not in added_indexes)
return removed_indexes, added_indexes, index_throughput_changes
def validate_index(index, module):
for key, val in index.iteritems():
for key, val in index.items():
if key not in INDEX_OPTIONS:
module.fail_json(msg='%s is not a valid option for an index' % key)
for required_option in INDEX_REQUIRED_OPTIONS:

2
lib/ansible/modules/cloud/amazon/ec2_asg.py
View File

@@ -458,7 +458,7 @@ def create_autoscaling_group(connection, module):
asg_tags = []
for tag in set_tags:
for k,v in tag.iteritems():
for k,v in tag.items():
if k !='propagate_at_launch':
asg_tags.append(Tag(key=k,
value=v,

2
lib/ansible/modules/cloud/amazon/ec2_asg_facts.py
View File

@@ -206,7 +206,7 @@ except ImportError:
HAS_BOTO3 = False
def match_asg_tags(tags_to_match, asg):
for key, value in tags_to_match.iteritems():
for key, value in tags_to_match.items():
for tag in asg['Tags']:
if key == tag['Key'] and value == tag['Value']:
break

4
lib/ansible/modules/cloud/amazon/ec2_elb_lb.py
View File

@@ -911,7 +911,7 @@ class ElbManager(object):
if not self.elb.health_check:
self.elb.health_check = HealthCheck()
for attr, desired_value in health_check_config.iteritems():
for attr, desired_value in health_check_config.items():
if getattr(self.elb.health_check, attr) != desired_value:
setattr(self.elb.health_check, attr, desired_value)
update_health_check = True
@@ -950,7 +950,7 @@ class ElbManager(object):
}
update_access_logs_config = False
for attr, desired_value in access_logs_config.iteritems():
for attr, desired_value in access_logs_config.items():
if getattr(attributes.access_log, attr) != desired_value:
setattr(attributes.access_log, attr, desired_value)
update_access_logs_config = True

2
lib/ansible/modules/cloud/amazon/ec2_facts.py
View File

@@ -97,7 +97,7 @@ class Ec2Metadata(object):
def _mangle_fields(self, fields, uri, filter_patterns=['public-keys-0']):
new_fields = {}
for key, value in fields.iteritems():
for key, value in fields.items():
split_fields = key[len(uri):].split('/')
if len(split_fields) > 1 and split_fields[1]:
new_key = "-".join(split_fields)

2
lib/ansible/modules/cloud/amazon/ec2_vpc_dhcp_options_facts.py
View File

@@ -106,7 +106,7 @@ def list_dhcp_options(client, module):
if module.params.get('filters'):
params['Filters'] = []
for key, value in module.params.get('filters').iteritems():
for key, value in module.params.get('filters').items():
temp_dict = dict()
temp_dict['Name'] = key
if isinstance(value, basestring):

4
lib/ansible/modules/cloud/amazon/ec2_vpc_nacl.py
View File

@@ -161,7 +161,7 @@ def icmp_present(entry):
def load_tags(module):
tags = []
if module.params.get('tags'):
for name, value in module.params.get('tags').iteritems():
for name, value in module.params.get('tags').items():
tags.append({'Key': name, 'Value': str(value)})
tags.append({'Key': "Name", 'Value': module.params.get('name')})
else:
@@ -239,7 +239,7 @@ def tags_changed(nacl_id, client, module):
if nacl['NetworkAcls']:
nacl_values = [t.values() for t in nacl['NetworkAcls'][0]['Tags']]
nacl_tags = [item for sublist in nacl_values for item in sublist]
tag_values = [[key, str(value)] for key, value in tags.iteritems()]
tag_values = [[key, str(value)] for key, value in tags.items()]
tags = [item for sublist in tag_values for item in sublist]
if sorted(nacl_tags) == sorted(tags):
changed = False

4
lib/ansible/modules/cloud/amazon/ec2_vpc_peer.py
View File

@@ -210,7 +210,7 @@ def tags_changed(pcx_id, client, module):
if pcx['VpcPeeringConnections']:
pcx_values = [t.values() for t in pcx['VpcPeeringConnections'][0]['Tags']]
pcx_tags = [item for sublist in pcx_values for item in sublist]
tag_values = [[key, str(value)] for key, value in tags.iteritems()]
tag_values = [[key, str(value)] for key, value in tags.items()]
tags = [item for sublist in tag_values for item in sublist]
if sorted(pcx_tags) == sorted(tags):
changed = False
@@ -305,7 +305,7 @@ def accept_reject_delete(state, client, module):
def load_tags(module):
tags = []
if module.params.get('tags'):
for name, value in module.params.get('tags').iteritems():
for name, value in module.params.get('tags').items():
tags.append({'Key': name, 'Value': str(value)})
return tags

2
lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py
View File

@@ -233,7 +233,7 @@ def get_resource_tags(vpc_conn, resource_id):
def tags_match(match_tags, candidate_tags):
return all((k in candidate_tags and candidate_tags[k] == v
for k, v in match_tags.iteritems()))
for k, v in match_tags.items()))
def ensure_tags(vpc_conn, resource_id, tags, add_only, check_mode):

2
lib/ansible/modules/cloud/amazon/ec2_vpc_vgw.py
View File

@@ -276,7 +276,7 @@ def load_tags(module):
tags = []
if module.params.get('tags'):
for name, value in module.params.get('tags').iteritems():
for name, value in module.params.get('tags').items():
tags.append({'Key': name, 'Value': str(value)})
tags.append({'Key': "Name", 'Value': module.params.get('name')})
else:

4
lib/ansible/modules/cloud/amazon/ecs_taskdefinition.py
View File

@@ -244,7 +244,7 @@ def main():
def _right_has_values_of_left(left, right):
# Make sure the values are equivalent for everything left has
for k, v in left.iteritems():
for k, v in left.items():
if not ((not v and (k not in right or not right[k])) or (k in right and v == right[k])):
# We don't care about list ordering because ECS can change things
if isinstance(v, list) and k in right:
@@ -261,7 +261,7 @@ def main():
return False
# Make sure right doesn't have anything that left doesn't
for k, v in right.iteritems():
for k, v in right.items():
if v and k not in left:
return False

4
lib/ansible/modules/cloud/amazon/elasticache.py
View File

@@ -385,7 +385,7 @@ class ElastiCacheManager(object):
'NumCacheNodes': self.num_nodes,
'EngineVersion': self.cache_engine_version
}
for key, value in modifiable_data.iteritems():
for key, value in modifiable_data.items():
if value is not None and self.data[key] != value:
return True
@@ -419,7 +419,7 @@ class ElastiCacheManager(object):
# Only check for modifications if zone is specified
if self.zone is not None:
unmodifiable_data['zone'] = self.data['PreferredAvailabilityZone']
for key, value in unmodifiable_data.iteritems():
for key, value in unmodifiable_data.items():
if getattr(self, key) is not None and getattr(self, key) != value:
return True
return False

2
lib/ansible/modules/cloud/amazon/s3_bucket.py
View File

@@ -141,7 +141,7 @@ def create_tags_container(tags):
tag_set = TagSet()
tags_obj = Tags()
for key, val in tags.iteritems():
for key, val in tags.items():
tag_set.add_tag(key, val)
tags_obj.add_tag_set(tag_set)