summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJames Tanner <tanner.jc@gmail.com>2016-11-16 14:53:03 -0500
committerToshio Kuratomi <a.badger@gmail.com>2016-11-16 13:02:46 -0800
commit39cb6797a35254f22d50d04993084c88356c3461 (patch)
treeb20da07da119c60ff70c8952196ff3aa3c7be418 /contrib
parent6f5ec79e91d70013b76489840d050dbcbeb911e8 (diff)
downloadansible-39cb6797a35254f22d50d04993084c88356c3461.tar.gz
Port has_key to python3 compatible syntax
(cherry picked from commit 2d2bb626d4f6da834d561cbbb25c158f6837e2cb)
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/inventory/gce.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/contrib/inventory/gce.py b/contrib/inventory/gce.py
index d485616636..1046b84a04 100755
--- a/contrib/inventory/gce.py
+++ b/contrib/inventory/gce.py
@@ -261,7 +261,7 @@ class GceInventory(object):
if inst is None:
return {}
- if inst.extra['metadata'].has_key('items'):
+ if 'items' in inst.extra['metadata']:
for entry in inst.extra['metadata']['items']:
md[entry['key']] = entry['value']
@@ -326,7 +326,7 @@ class GceInventory(object):
if zones and zone not in zones:
continue
- if groups.has_key(zone): groups[zone].append(name)
+ if zone in groups: groups[zone].append(name)
else: groups[zone] = [name]
tags = node.extra['tags']
@@ -335,25 +335,25 @@ class GceInventory(object):
tag = t[6:]
else:
tag = 'tag_%s' % t
- if groups.has_key(tag): groups[tag].append(name)
+ if tag in groups: groups[tag].append(name)
else: groups[tag] = [name]
net = node.extra['networkInterfaces'][0]['network'].split('/')[-1]
net = 'network_%s' % net
- if groups.has_key(net): groups[net].append(name)
+ if net in groups: groups[net].append(name)
else: groups[net] = [name]
machine_type = node.size
- if groups.has_key(machine_type): groups[machine_type].append(name)
+ if machine_type in groups: groups[machine_type].append(name)
else: groups[machine_type] = [name]
image = node.image and node.image or 'persistent_disk'
- if groups.has_key(image): groups[image].append(name)
+ if image in groups: groups[image].append(name)
else: groups[image] = [name]
status = node.extra['status']
stat = 'status_%s' % status.lower()
- if groups.has_key(stat): groups[stat].append(name)
+ if stat in groups: groups[stat].append(name)
else: groups[stat] = [name]
groups["_meta"] = meta