a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes from 'make pep8'. Partial, more to come.

pull/4420/head
Michael DeHaan 2013-02-17 19:40:38 -05:00
parent 23a0a8daf9
commit 9cf66f4376
4 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/playbook/play.py
View File

@ -200,7 +200,7 @@ class Play(object):
salt = var.get("salt", None) salt = var.get("salt", None)
if vname not in self.playbook.extra_vars: if vname not in self.playbook.extra_vars:
vars[vname] = self.playbook.callbacks.on_vars_prompt ( vars[vname] = self.playbook.callbacks.on_vars_prompt(
vname, private, prompt, encrypt, confirm, salt_size, salt, default vname, private, prompt, encrypt, confirm, salt_size, salt, default
) )

5
lib/ansible/runner/__init__.py
View File

@ -51,7 +51,6 @@ multiprocessing_runner = None
################################################ ################################################
def _executor_hook(job_queue, result_queue): def _executor_hook(job_queue, result_queue):
# attempt workaround of https://github.com/newsapps/beeswithmachineguns/issues/17 # attempt workaround of https://github.com/newsapps/beeswithmachineguns/issues/17
@ -531,9 +530,9 @@ class Runner(object):
err = stderr err = stderr
if rc is not None: if rc is not None:
return dict(rc=rc, stdout=out, stderr=err ) return dict(rc=rc, stdout=out, stderr=err)
else: else:
return dict(stdout=out, stderr=err ) return dict(stdout=out, stderr=err)
# ***************************************************** # *****************************************************

4
lib/ansible/utils/template.py
View File

@ -259,11 +259,13 @@ class _jinja2_vars(object):
here. here.
extras is a list of locals to also search for variables. extras is a list of locals to also search for variables.
''' '''
def __init__(self, basedir, vars, globals, *extras): def __init__(self, basedir, vars, globals, *extras):
self.basedir = basedir self.basedir = basedir
self.vars = vars self.vars = vars
self.globals = globals self.globals = globals
self.extras = extras self.extras = extras
def __contains__(self, k): def __contains__(self, k):
if k in self.vars: if k in self.vars:
return True return True
@ -273,6 +275,7 @@ class _jinja2_vars(object):
if k in self.globals: if k in self.globals:
return True return True
return False return False
def __getitem__(self, varname): def __getitem__(self, varname):
if varname not in self.vars: if varname not in self.vars:
for i in self.extras: for i in self.extras:
@ -288,6 +291,7 @@ class _jinja2_vars(object):
return var return var
else: else:
return template(self.basedir, var, self.vars) return template(self.basedir, var, self.vars)
def add_locals(self, locals): def add_locals(self, locals):
''' '''
If locals are provided, create a copy of self containing those If locals are provided, create a copy of self containing those