linting cleanup

Author: LindsayHill

actions/acl_list.py

@@ -1,7 +1,7 @@
-from lib import action
-
 import json
 
+from lib import action
+
 
 class ConsulAclListAction(action.ConsulBaseAction):
     def run(self):

actions/catalog_node.py

@@ -2,20 +2,18 @@
 
 
 class ConsulCatalogNodeAction(action.ConsulBaseAction):
-    def run(
-        self,
-        node,
-        index=None,
-        wait=None,
-        consistency=None,
-        dc=None,
-        token=None
-    ):
-        return (True, self.consul.catalog.node(
+    def run(self,
             node,
-            index=index,
-            wait=wait,
-            consistency=consistency,
-            dc=dc,
-            token=token
-            ))
+            index=None,
+            wait=None,
+            consistency=None,
+            dc=None,
+            token=None):
+
+        return (True,
+                self.consul.catalog.node(node,
+                                         index=index,
+                                         wait=wait,
+                                         consistency=consistency,
+                                         dc=dc,
+                                         token=token))

actions/catalog_nodes.py

@@ -2,15 +2,13 @@
 
 
 class ConsulCatalogNodesAction(action.ConsulBaseAction):
-    def run(
-        self,
-        index=None,
-        wait=None,
-        consistency=None,
-        dc=None,
-        near=None,
-        token=None
-    ):
+    def run(self,
+            index=None,
+            wait=None,
+            consistency=None,
+            dc=None,
+            near=None,
+            token=None):
 
         return (True, self.consul.catalog.nodes(
             index=index,

actions/catalog_service.py

@@ -2,17 +2,15 @@
 
 
 class ConsulCatalogServiceAction(action.ConsulBaseAction):
-    def run(
-        self,
-        service,
-        index=None,
-        wait=None,
-        tag=None,
-        consistency=None,
-        dc=None,
-        near=None,
-        token=None
-    ):
+    def run(self,
+            service,
+            index=None,
+            wait=None,
+            tag=None,
+            consistency=None,
+            dc=None,
+            near=None,
+            token=None):
 
         return (True, self.consul.catalog.service(
             service=service,

actions/catalog_services.py

@@ -2,14 +2,12 @@
 
 
 class ConsulCatalogServicesAction(action.ConsulBaseAction):
-    def run(
-        self,
-        index=None,
-        wait=None,
-        consistency=None,
-        dc=None,
-        token=None
-    ):
+    def run(self,
+            index=None,
+            wait=None,
+            consistency=None,
+            dc=None,
+            token=None):
 
         return (True, self.consul.catalog.services(
             index=index,

actions/event_fire.py

@@ -2,13 +2,12 @@
 
 
 class ConsulEventFireAction(action.ConsulBaseAction):
-    def run(
-        self,
-        name,
-        body="",
-        node=None,
-        service=None,
-        tag=None):
+    def run(self,
+            name,
+            body="",
+            node=None,
+            service=None,
+            tag=None):
 
         if len(body) > 100:
             self.logger.warn("Event body being fired exceeds the recommended 100 byte limit!")

actions/event_list.py

@@ -2,12 +2,10 @@
 
 
 class ConsulEventListAction(action.ConsulBaseAction):
-    def run(
-        self,
-        name=None,
-        index=None,
-        wait=None
-    ):
+    def run(self,
+            name=None,
+            index=None,
+            wait=None):
 
         if name == "":
             name = None

actions/kv_get.py

@@ -1,5 +1,4 @@
 from lib import action
-import json
 
 
 class ConsulKVGetAction(action.ConsulBaseAction):
@@ -27,7 +26,7 @@ def run(self,
 
         if from_json and not keys:
             if isinstance(res, dict):
-                    res["Value"] = self.from_json(res["Value"])
+                res["Value"] = self.from_json(res["Value"])
             if isinstance(res, list):
                 for item in res:
                     item["Value"] = self.from_json(item["Value"])

actions/lib/action.py

@@ -1,9 +1,9 @@
+import json
 from st2common import log as logging
 from st2common.runners.base_action import Action
 
 # http://python-consul.readthedocs.org/en/latest/#
 import consul
-import json
 
 
 class ConsulBaseAction(Action):