cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Switch from map and filter to list comprehensions and generator expressions (#27198)

Browse source 
One of the complex map + filter + lambda combinations here was causing
pylint to have a rare false positive detecting undefined variables.

Switch to list comprehensions and generator expressions which are
easi(er) to read for humans and do not confuse pylint.

References #27193
This commit is contained in:
Toshio Kuratomi 2017-07-22 19:12:35 -07:00 committed by GitHub
parent 1c40631382
commit 4e8b28e404
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/cli/galaxy.py
View file

@ -226,18 +226,18 @@ class GalaxyCLI(CLI):
skeleton_ignore_expressions = ['^.*/.git_keep$'] skeleton_ignore_expressions = ['^.*/.git_keep$']
role_skeleton = os.path.expanduser(role_skeleton) role_skeleton = os.path.expanduser(role_skeleton)
skeleton_ignore_re = list(map(lambda x: re.compile(x), skeleton_ignore_expressions)) skeleton_ignore_re = [re.compile(x) for x in skeleton_ignore_expressions]
template_env = Environment(loader=FileSystemLoader(role_skeleton)) template_env = Environment(loader=FileSystemLoader(role_skeleton))
for root, dirs, files in os.walk(role_skeleton, topdown=True): for root, dirs, files in os.walk(role_skeleton, topdown=True):
rel_root = os.path.relpath(root, role_skeleton) rel_root = os.path.relpath(root, role_skeleton)
in_templates_dir = rel_root.split(os.sep, 1)[0] == 'templates' in_templates_dir = rel_root.split(os.sep, 1)[0] == 'templates'
dirs[:] = filter(lambda d: not any(map(lambda r: r.match(os.path.join(rel_root, d)), skeleton_ignore_re)), dirs) dirs[:] = [d for d in dirs if not any(r.match(os.path.join(rel_root, d)) for r in skeleton_ignore_re)]
for f in files: for f in files:
filename, ext = os.path.splitext(f) filename, ext = os.path.splitext(f)
if any(map(lambda r: r.match(os.path.join(rel_root, f)), skeleton_ignore_re)): if any(r.match(os.path.join(rel_root, f)) for r in skeleton_ignore_re):
continue continue
elif ext == ".j2" and not in_templates_dir: elif ext == ".j2" and not in_templates_dir:
src_template = os.path.join(rel_root, f) src_template = os.path.join(rel_root, f)
@ -343,8 +343,7 @@ class GalaxyCLI(CLI):
try: try:
roles_left += [ roles_left += [
GalaxyRole(self.galaxy, **r) for r in GalaxyRole(self.galaxy, **r) for r in
map(RoleRequirement.role_yaml_parse, (RoleRequirement.role_yaml_parse(i) for i in yaml.safe_load(f_include))
yaml.safe_load(f_include))
] ]
except Exception as e: except Exception as e:
msg = "Unable to load data from the include requirements file: %s %s" msg = "Unable to load data from the include requirements file: %s %s"