ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-30 04:49:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Removed dict.iteritems() in several other files.

Browse source 
This is for py3 compatibility #18506
This commit is contained in:
Andrea Tartaglia 2016-12-13 15:47:08 +00:00 • committed by Toshio Kuratomi
parent 7c71c678fa
commit 59227d8c31
13 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
contrib/inventory/vmware_inventory.py
View file

@ -230,7 +230,7 @@ class VMWareInventory(object):
config.read(vmware_ini_path)
# apply defaults
for k,v in defaults['vmware'].iteritems():
for k,v in defaults['vmware'].items():
if not config.has_option('vmware', k):
config.set('vmware', k, str(v))
@ -401,7 +401,7 @@ class VMWareInventory(object):
# Reset the inventory keys
for k,v in name_mapping.iteritems():
for k,v in name_mapping.items():
if not host_mapping or not k in host_mapping:
continue
@ -434,7 +434,7 @@ class VMWareInventory(object):
continue
self.debugl('filter: %s' % hf)
filter_map = self.create_template_mapping(inventory, hf, dtype='boolean')
for k,v in filter_map.iteritems():
for k,v in filter_map.items():
if not v:
# delete this host
inventory['all']['hosts'].remove(k)
@ -447,7 +447,7 @@ class VMWareInventory(object):
# Create groups
for gbp in self.groupby_patterns:
groupby_map = self.create_template_mapping(inventory, gbp)
for k,v in groupby_map.iteritems():
for k,v in groupby_map.items():
if v not in inventory:
inventory[v] = {}
inventory[v]['hosts'] = []
@ -462,7 +462,7 @@ class VMWareInventory(object):
''' Return a hash of uuid to templated string from pattern '''
mapping = {}
for k,v in inventory['_meta']['hostvars'].iteritems():
for k,v in inventory['_meta']['hostvars'].items():
t = jinja2.Template(pattern)
newkey = None
try:
@ -671,7 +671,7 @@ class VMWareInventory(object):
# check if the machine has the name requested
keys = self.inventory['_meta']['hostvars'].keys()
match = None
for k,v in self.inventory['_meta']['hostvars'].iteritems():
for k,v in self.inventory['_meta']['hostvars'].items():
if self.inventory['_meta']['hostvars'][k]['name'] == self.args.host:
match = k
break