Merge pull request #9 from StackStorm-Exchange/linting

Kami · web-flow · commit 114d503f96b3 · 2017-11-28T11:21:18.000+01:00
Linting fixes
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## [0.6.1] 27 Nov 2017
+
+- Linting fixes
+
 ## [0.6.0] 16 Nov 2017
 
 ### Added the following API calls. (See https://python-consul.readthedocs.io for documentation)
diff --git a/actions/acl_list.py b/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):
diff --git a/actions/agent_service_deregister.py b/actions/agent_service_deregister.py
@@ -3,4 +3,4 @@
 
 class ConsulServiceDeregisterAction(action.ConsulBaseAction):
     def run(self, service_id):
-        return (True, self.consul.service.deregister(service_id=service_id))
+        return (True, self.consul.agent.service.deregister(service_id=service_id))
diff --git a/actions/agent_service_deregister.yaml b/actions/agent_service_deregister.yaml
@@ -2,7 +2,7 @@ name: service_deregister
 runner_type: python-script
 description: "Remove a service from the local agent."
 enabled: true
-entry_point: "service_deregister.py"
+entry_point: "agent_service_deregister.py"
 parameters:
     service_id:
         type: string
diff --git a/actions/agent_service_maintenance.py b/actions/agent_service_maintenance.py
@@ -3,7 +3,7 @@
 
 class ConsulServiceMaintenanceAction(action.ConsulBaseAction):
     def run(self, service_id, enable, reason=None):
-        return (True, self.consul.service.maintenance(
+        return (True, self.consul.agent.service.maintenance(
             service_id=service_id,
             enable=enable,
             reason=reason
diff --git a/actions/agent_service_maintenance.yaml b/actions/agent_service_maintenance.yaml
@@ -2,7 +2,7 @@ name: service_maintenance
 runner_type: python-script
 description: "Put a given service into _maintenance mode_."
 enabled: true
-entry_point: "service_maintenance.py"
+entry_point: "agent_service_maintenance.py"
 parameters:
     service_id:
         type: string
diff --git a/actions/agent_service_register.py b/actions/agent_service_register.py
@@ -11,7 +11,7 @@ def run(self,
             check=None,
             token=None,
             enable_tag_override=False):
-        return (True, self.consul.service.register(
+        return (True, self.consul.agent.service.register(
             name=name,
             service_id=service_id,
             address=address,
diff --git a/actions/agent_service_register.yaml b/actions/agent_service_register.yaml
@@ -2,7 +2,7 @@ name: service_register
 runner_type: python-script
 description: "Add a new service to the local agent."
 enabled: true
-entry_point: "service_register.py"
+entry_point: "agent_service_register.py"
 parameters:
     name:
         type: string
diff --git a/actions/catalog_nodes.py b/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,
diff --git a/actions/catalog_service.py b/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,
diff --git a/actions/catalog_services.py b/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,
diff --git a/actions/event_fire.py b/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!")
diff --git a/actions/event_list.py b/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
diff --git a/actions/kv_get.py b/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"])
diff --git a/actions/lib/action.py b/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):
@@ -38,6 +38,6 @@ def from_json(self, value):
         """
         try:
             value = json.loads(value)
-        except ValueError as ignore_exception:
+        except ValueError:
             pass
         return value
diff --git a/pack.yaml b/pack.yaml
@@ -2,6 +2,6 @@
 ref: consul
 name: consul
 description: consul
-version: 0.6.0
+version: 0.6.1
 author: jfryman
 email: james@fryman.io
