From 0ced29c51bca3a8f32dcd0270be1656b1446686b Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Thu, 23 Mar 2017 13:40:02 -0500
Subject: [PATCH] Don't skip action/__init__.py (#22911)

---
 lib/ansible/plugins/action/__init__.py | 14 +++++++-------
 test/sanity/pep8/legacy-files.txt      |  1 +
 test/sanity/pep8/skip.txt              |  1 -
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py
index 8f31c4c28b..e7660a8496 100644
--- a/lib/ansible/plugins/action/__init__.py
+++ b/lib/ansible/plugins/action/__init__.py
@@ -213,13 +213,13 @@ class ActionBase(with_metaclass(ABCMeta, object)):
 
         # any of these require a true
         for condition in [
-              self._connection.has_pipelining,
-              self._play_context.pipelining,
-              module_style == "new",                     # old style modules do not support pipelining
-              not C.DEFAULT_KEEP_REMOTE_FILES,           # user wants remote files
-              not wrap_async,                            # async does not support pipelining
-              self._play_context.become_method != 'su',  # su does not work with pipelining,
-              # FIXME: we might need to make become_method exclusion a configurable list
+            self._connection.has_pipelining,
+            self._play_context.pipelining,
+            module_style == "new",                     # old style modules do not support pipelining
+            not C.DEFAULT_KEEP_REMOTE_FILES,           # user wants remote files
+            not wrap_async,                            # async does not support pipelining
+            self._play_context.become_method != 'su',  # su does not work with pipelining,
+            # FIXME: we might need to make become_method exclusion a configurable list
         ]:
             if not condition:
                 return False
diff --git a/test/sanity/pep8/legacy-files.txt b/test/sanity/pep8/legacy-files.txt
index 0261bc33e0..8dc3527ad8 100644
--- a/test/sanity/pep8/legacy-files.txt
+++ b/test/sanity/pep8/legacy-files.txt
@@ -879,6 +879,7 @@ lib/ansible/playbook/taggable.py
 lib/ansible/playbook/task.py
 lib/ansible/playbook/task_include.py
 lib/ansible/plugins/__init__.py
+lib/ansible/plugins/action/__init__.py
 lib/ansible/plugins/action/asa_config.py
 lib/ansible/plugins/action/asa_template.py
 lib/ansible/plugins/action/assemble.py
diff --git a/test/sanity/pep8/skip.txt b/test/sanity/pep8/skip.txt
index 733f239e06..e69de29bb2 100644
--- a/test/sanity/pep8/skip.txt
+++ b/test/sanity/pep8/skip.txt
@@ -1 +0,0 @@
-lib/ansible/plugins/action/__init__.py