pep8 cleanup

Author: gmr

consulate/api/__init__.py

@@ -12,3 +12,16 @@
 from consulate.api.session import Session
 from consulate.api.status import Status
 from consulate.api.base import Response
+
+__all__ = [
+    ACL,
+    Agent,
+    Catalog,
+    Event,
+    Health,
+    KV,
+    Lock,
+    Session,
+    Status,
+    Response
+]

consulate/api/base.py

@@ -9,7 +9,6 @@
 except ImportError:  # pragma: no cover
     from urllib import urlencode  # Python 2
 
-from consulate import exceptions
 from consulate import utils
 
 

consulate/api/catalog.py

@@ -94,7 +94,8 @@ def register(self, node, address,
 
         return self._put_response_body(['register'], None, payload)
 
-    def deregister(self, node, datacenter=None, check_id=None, service_id=None):
+    def deregister(self, node, datacenter=None,
+                   check_id=None, service_id=None):
         """Directly remove entries in the catalog. It is usually recommended
         to use the agent local endpoints, as they are simpler and perform
         anti-entropy.

consulate/api/lock.py

@@ -7,7 +7,7 @@
 import uuid
 
 from consulate.api import base
-from consulate import utils, exceptions
+from consulate import exceptions
 
 LOGGER = logging.getLogger(__name__)
 

consulate/cli.py

@@ -55,19 +55,22 @@ def connection_error():
 
 KV_PARSERS = [
     ('backup', 'Backup to stdout or a JSON file', [
-        [['key'], {'help': 'The key to use as target to backup a specific key or folder.', 
-                   'nargs':'?'}],
+        [['key'], {'help': 'The key to use as target to backup a '
+                           'specific key or folder.',
+                   'nargs': '?'}],
         [['-b', '--base64'], {'help': 'Base64 encode values',
                               'action': 'store_true'}],
         [['-f', '--file'], {'help': 'JSON file to write instead of stdout',
                             'nargs': '?'}],
         [['-p', '--pretty'], {'help': 'pretty-print JSON output',
                               'action': 'store_true'}]]),
     ('restore', 'Restore from stdin or a JSON file', [
-        [['key'], {'help': 'The key as target to restore to a specific key or folder.',
-                   'nargs':'?'}],
-        [['-p', '--prune'], {'help':'Remove entries from consul tree that are not in restore file.',
-                              'action': 'store_true'}],
+        [['key'], {'help': 'The key as target to restore to a specific key '
+                           'or folder.',
+                   'nargs': '?'}],
+        [['-p', '--prune'], {'help': 'Remove entries from consul tree that '
+                                     'are not in restore file.',
+                             'action': 'store_true'}],
         [['-b', '--base64'], {'help': 'Restore from Base64 encode values',
                               'action': 'store_true'}],
         [['-f', '--file'],
@@ -77,8 +80,9 @@ def connection_error():
          {'help': 'Do not replace existing entries',
           'action': 'store_true'}]]),
     ('ls', 'List all of the keys', [
-        [['key'], {'help': 'The key to use as target to list contents of specific key or folder',
-                   'nargs':'?'}],
+        [['key'], {'help': 'The key to use as target to list contents of '
+                           'specific key or folder',
+                   'nargs': '?'}],
         [['-l', '--long'],
          {'help': 'Long format',
           'action': 'store_true'}]]),
@@ -165,11 +169,11 @@ def add_register_args(parser):
     check.add_argument('path', default=None,
                        help='Path to the script invoked by Consul')
     httpcheck = rsparsers.add_parser('httpcheck',
-                                 help='Define an HTTP-based check')
+                                     help='Define an HTTP-based check')
     httpcheck.add_argument('interval', default=10, type=int,
-                       help='How often to run the check script')
+                           help='How often to run the check script')
     httpcheck.add_argument('url', default=None,
-                       help='HTTP URL to be polled by Consul')
+                           help='HTTP URL to be polled by Consul')
     rsparsers.add_parser('no-check', help='Do not enable service monitoring')
     ttl = rsparsers.add_parser('ttl', help='Define a duration based TTL check')
     ttl.add_argument('duration', type=int, default=10,
@@ -436,7 +440,6 @@ def kv_restore(consul, args):
                 consul.kv.delete(key)
             except exceptions.ConnectionError:
                 connection_error()
-            
 
 
 def kv_rm(consul, args):