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

lib/ansible/playbook/play.py

@@ -200,7 +200,7 @@ class Play(object):
                 salt = var.get("salt", None)
 
                 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
                                   )
 

lib/ansible/runner/__init__.py

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

lib/ansible/runner/action_plugins/template.py

@@ -79,39 +79,39 @@ class ActionModule(object):
 
         if local_md5 != remote_md5:
 
-             # template is different from the remote value
-
-             # if showing diffs, we need to get the remote value
-             dest_contents = None
-
-             if self.runner.diff:
-                 # using persist_files to keep the temp directory around to avoid needing to grab another
-                 dest_result = self.runner._execute_module(conn, tmp, 'slurp', "path=%s" % dest, inject=inject, persist_files=True)
-                 if 'content' in dest_result.result:
-                     dest_contents = dest_result.result['content']
-                     if dest_result.result['encoding'] == 'base64':
-                         dest_contents = base64.b64decode(dest_contents)
-                     else:
-                         raise Exception("unknown encoding, failed: %s" % dest_result.result)
-                 else:
-                     dest_result = ''
+            # template is different from the remote value
+
+            # if showing diffs, we need to get the remote value
+            dest_contents = None
+
+            if self.runner.diff:
+                # using persist_files to keep the temp directory around to avoid needing to grab another
+                dest_result = self.runner._execute_module(conn, tmp, 'slurp', "path=%s" % dest, inject=inject, persist_files=True)
+                if 'content' in dest_result.result:
+                    dest_contents = dest_result.result['content']
+                    if dest_result.result['encoding'] == 'base64':
+                        dest_contents = base64.b64decode(dest_contents)
+                    else:
+                        raise Exception("unknown encoding, failed: %s" % dest_result.result)
+                else:
+                    dest_result = ''
  
-             xfered = self.runner._transfer_str(conn, tmp, 'source', resultant)
-
-             # fix file permissions when the copy is done as a different user
-             if self.runner.sudo and self.runner.sudo_user != 'root':
-                 self.runner._low_level_exec_command(conn, "chmod a+r %s" % xfered, tmp)
-
-             # run the copy module
-             module_args = "%s src=%s dest=%s" % (module_args, xfered, dest)
-
-             if self.runner.check:
-                 return ReturnData(conn=conn, comm_ok=True, result=dict(changed=True), before_diff_value=dest_contents, after_diff_value=resultant)
-             else:
-                 res =  self.runner._execute_module(conn, tmp, 'copy', module_args, inject=inject)
-                 res.before_diff_value = dest_contents
-                 res.after_diff_value = resultant
-                 return res
+            xfered = self.runner._transfer_str(conn, tmp, 'source', resultant)
+
+            # fix file permissions when the copy is done as a different user
+            if self.runner.sudo and self.runner.sudo_user != 'root':
+                self.runner._low_level_exec_command(conn, "chmod a+r %s" % xfered, tmp)
+
+            # run the copy module
+            module_args = "%s src=%s dest=%s" % (module_args, xfered, dest)
+
+            if self.runner.check:
+                return ReturnData(conn=conn, comm_ok=True, result=dict(changed=True), before_diff_value=dest_contents, after_diff_value=resultant)
+            else:
+                res = self.runner._execute_module(conn, tmp, 'copy', module_args, inject=inject)
+                res.before_diff_value = dest_contents
+                res.after_diff_value = resultant
+                return res
         else:
-             return ReturnData(conn=conn, comm_ok=True, result=dict(changed=False))
+            return ReturnData(conn=conn, comm_ok=True, result=dict(changed=False))
 

lib/ansible/utils/template.py

@@ -162,7 +162,7 @@ def _varFind(basedir, text, vars, lookup_fatal, depth, expand_lists):
         if basedir is None:
             return {'replacement': None, 'start': start, 'end': end}
         var_end -= 1
-    	from ansible import utils
+        from ansible import utils
         args = text[part_start:var_end]
         if lookup_plugin_name == 'LOOKUP':
             lookup_plugin_name, args = args.split(",", 1)
@@ -259,11 +259,13 @@ class _jinja2_vars(object):
     here.
     extras is a list of locals to also search for variables. 
     '''
+
     def __init__(self, basedir, vars, globals, *extras):
         self.basedir = basedir
         self.vars = vars
         self.globals = globals
         self.extras = extras
+
     def __contains__(self, k):
         if k in self.vars:
             return True
@@ -273,6 +275,7 @@ class _jinja2_vars(object):
         if k in self.globals:
             return True
         return False
+
     def __getitem__(self, varname):
         if varname not in self.vars:
             for i in self.extras:
@@ -288,6 +291,7 @@ class _jinja2_vars(object):
             return var
         else:
             return template(self.basedir, var, self.vars)
+
     def add_locals(self, locals):
         '''
         If locals are provided, create a copy of self containing those