Skip to content

Commit 2b5e063

Browse files
committed
ansible: make code compatible with python3 (3.6)
and `flake8` styled
1 parent c47aa6a commit 2b5e063

File tree

2 files changed

+17
-21
lines changed

2 files changed

+17
-21
lines changed

ansible/plugins/inventory/nodejs_yaml.py

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,9 @@
2727
import configparser
2828
except ImportError:
2929
import ConfigParser as configparser
30-
try:
31-
from itertools import ifilter
32-
except ImportError:
33-
from itertools import filter as ifilter
3430
import json
31+
3532
import yaml
36-
import os
37-
import sys
3833

3934

4035
valid = {
@@ -86,7 +81,7 @@ def main():
8681
config.read('ansible.cfg')
8782

8883
for host_types in hosts['hosts']:
89-
for host_type, providers in host_types.iteritems():
84+
for host_type, providers in host_types.items():
9085
export[host_type] = {}
9186
export[host_type]['hosts'] = []
9287

@@ -96,8 +91,8 @@ def main():
9691
}
9792

9893
for provider in providers:
99-
for provider_name, hosts in provider.iteritems():
100-
for host, metadata in hosts.iteritems():
94+
for provider_name, hosts in provider.items():
95+
for host, metadata in hosts.items():
10196

10297
# some hosts have metadata appended to provider
10398
# which requires underscore
@@ -111,9 +106,9 @@ def main():
111106

112107
try:
113108
parsed_host = parse_host(hostname)
114-
for k, v in parsed_host.iteritems():
109+
for k, v in parsed_host.items():
115110
c.update({k: v[0] if type(v) is dict else v})
116-
except Exception, e:
111+
except Exception as e:
117112
raise Exception('Failed to parse host: %s' % e)
118113

119114
c.update({'ansible_host': metadata['ip']})
@@ -135,13 +130,13 @@ def main():
135130
c.update({'vs': metadata['vs']})
136131

137132
# add specific options from config
138-
for option in ifilter(lambda s: s.startswith('hosts:'),
139-
config.sections()):
140-
# remove `hosts:`
141-
if option[6:] in hostname:
142-
for o in config.items(option):
143-
# configparser returns tuples of key, value
144-
c.update({o[0]: o[1]})
133+
for section in filter(
134+
lambda s: s.startswith('hosts:') and s[6:] in hostname,
135+
config.sections()
136+
):
137+
for k, v in config.items(section, raw=True):
138+
# configparser returns tuples of key, value
139+
c.update({k: v})
145140

146141
export['_meta']['hostvars'][hostname] = {}
147142
export['_meta']['hostvars'][hostname].update(c)
@@ -175,7 +170,6 @@ def has_metadata(info):
175170
metadata by underscore. Not used anywhere at the moment for anything
176171
other than descriptiveness"""
177172

178-
param = dict()
179173
metadata = info.split('_', 1)
180174

181175
try:

ansible/plugins/library/ssh_config.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@
2222
# IN THE SOFTWARE.
2323
#
2424

25-
from ansible.module_utils.basic import *
26-
from jinja2 import Environment, Template, filters
2725
import os
2826
import re
2927

28+
from ansible.module_utils.basic import AnsibleModule
29+
from jinja2 import Environment
30+
31+
3032
pre_match = '# begin: node.js template'
3133
post_match = '# end: node.js template'
3234
match = re.compile(r'^' + re.escape(pre_match) + '(.*)' + re.escape(post_match),

0 commit comments

Comments
 (0)