Fixed PEP8 errors missed on previous merge.

Author: mboersma

client/deis.py

@@ -1635,6 +1635,7 @@ def providers_create(self, args):
 
         Usage: deis providers:create <id> <type> <creds>
         """
+        # TODO: This function has a McCabe of 13. Refactor for simplicity.
         type = args.get('<type>')  # @ReservedAssignment
         if type == 'ec2':
             # read creds from envvars
@@ -1731,13 +1732,15 @@ def providers_discover(self, args):
         else:
             print('No Rackspace credentials discovered.')
         if 'DIGITALOCEAN_API_KEY' in os.environ and 'DIGITALOCEAN_CLIENT_ID' in os.environ:
-            print("Found Digitalocean credentials: {}".format(os.environ['DIGITALOCEAN_CLIENT_ID']))
+            print("Found Digitalocean credentials: {}".format(
+                os.environ['DIGITALOCEAN_CLIENT_ID']))
             inp = raw_input('Import these credentials? (y/n) : ')
             if inp.lower().strip('\n') != 'y':
                 print('Aborting.')
             else:
-                creds = {'client_id': os.environ['DIGITALOCEAN_CLIENT_ID'],
-                         'api_key': os.environ['DIGITALOCEAN_API_KEY'],
+                creds = {
+                    'client_id': os.environ['DIGITALOCEAN_CLIENT_ID'],
+                    'api_key': os.environ['DIGITALOCEAN_API_KEY'],
                 }
                 body = {'creds': json.dumps(creds)}
                 sys.stdout.write('Uploading Digitalocean credentials... ')

provider/digitalocean.py

@@ -18,6 +18,7 @@
     'new-york-2': 'New York 2'
 }
 
+
 def seed_flavors():
     """Seed the database with default Flavors for digital ocean"""
     flavors = []
@@ -39,7 +40,7 @@ def build_layer(layer):
     # create a new SSH key
     name = "deis-{formation}-{id}".format(**layer)
     # import a new keypair to the Digital Ocean Control Panel
-    params = { 'name': name, 'ssh_pub_key': layer['ssh_public_key'] }
+    params = {'name': name, 'ssh_pub_key': layer['ssh_public_key']}
     conn.request('/ssh_keys/new/', method='GET', params=params)
     # Digital Ocean images only have the root user created by default
     l = Layer.objects.get(id=layer['id'])
@@ -90,10 +91,12 @@ def _get_droplet_kwargs(node, conn):
         'size_id': _get_id(conn.sizes(), params.get('size', '4GB')),
         'image_id': _get_id(conn.images(show_all=False), params.get('image', 'deis-base')),
         'region_id': _get_id(conn.regions(), params.get('region', 'San Francisco 1')),
-        'ssh_key_ids': [str(_get_id(conn.all_ssh_keys(), "deis-{formation}-{layer}".format(**node)))],
+        'ssh_key_ids': [str(_get_id(conn.all_ssh_keys(),
+                        "deis-{formation}-{layer}".format(**node)))],
         'virtio': True
     }
 
+
 def _get_droplet_metadata(droplet):
     return {
         'id': droplet.id,
@@ -107,17 +110,20 @@ def _get_droplet_metadata(droplet):
         'ip_address': droplet.ip_address
     }
 
+
 def _create_digitalocean_connection(creds):
     if not creds:
         raise EnvironmentError('No credentials provided')
     return client.Client(creds['client_id'], creds['api_key'])
 
+
 def _get_id(lst, name):
     for i in lst:
         if i.name == name:
             return i.id
     return None
 
+
 def _get_name(lst, name):
     for i in lst:
         if i.name == name:

setup.cfg

@@ -1,4 +1,4 @@
 [flake8]
 max-line-length = 99
 exclude = */api/migrations/*,*/build/*,*/venv/*,*/virtualenv/*
-max-complexity = 12
+max-complexity = 14