Some style fixes and release 1.1 ready to be uploaded

digitalocean/Account.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from .baseapi import BaseAPI
 
+
 class Account(BaseAPI):
     def __init__(self, *args, **kwargs):
         self.droplet_limit = None
@@ -25,7 +26,7 @@ def load(self):
         account = data['account']
 
         for attr in account.keys():
-            setattr(self,attr,account[attr])
+            setattr(self, attr, account[attr])
 
     def __str__(self):
-        return "%s" % self.email
+        return "%s" % self.email

digitalocean/Action.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from .baseapi import BaseAPI
 
+
 class Action(BaseAPI):
     def __init__(self, *args, **kwargs):
         self.id = None
@@ -32,7 +33,7 @@ def load_directly(self):
             action = action[u'action']
             # Loading attributes
             for attr in action.keys():
-                setattr(self,attr,action[attr])
+                setattr(self, attr, action[attr])
 
     def load(self):
         action = self.get_data(
@@ -45,7 +46,7 @@ def load(self):
             action = action[u'action']
             # Loading attributes
             for attr in action.keys():
-                setattr(self,attr,action[attr])
+                setattr(self, attr, action[attr])
 
     def __str__(self):
-        return "%s %s [%s]" % (self.id, self.type, self.status)
+        return "%s %s [%s]" % (self.id, self.type, self.status)

digitalocean/Domain.py

@@ -3,6 +3,7 @@
 from .Record import Record
 from .baseapi import BaseAPI
 
+
 class Domain(BaseAPI):
     def __init__(self, *args, **kwargs):
         self.name = None
@@ -27,7 +28,7 @@ def load(self):
         domain = domains['domain']
 
         for attr in domain.keys():
-            setattr(self,attr,domain[attr])
+            setattr(self, attr, domain[attr])
 
     def destroy(self):
         """
@@ -62,7 +63,7 @@ def create_new_domain_record(self, *args, **kwargs):
             "data": kwargs.get("data", None)
         }
 
-        # Optional Args
+        #  Optional Args
         if kwargs.get("priority", None):
             data['priority'] = kwargs.get("priority", None)
 
@@ -84,9 +85,9 @@ def create(self):
         """
         # URL https://api.digitalocean.com/v2/domains
         data = {
-                "name": self.name,
-                "ip_address": self.ip_address,
-            }
+            "name": self.name,
+            "ip_address": self.ip_address,
+        }
 
         domain = self.get_data(
             "domains",
@@ -115,4 +116,4 @@ def get_records(self):
         return records
 
     def __str__(self):
-        return "%s" % self.name
+        return "%s" % self.name

digitalocean/Droplet.py

@@ -1,21 +1,24 @@
 # -*- coding: utf-8 -*-
-import requests
 from .Action import Action
 from .Image import Image
 from .Kernel import Kernel
 from .baseapi import BaseAPI, Error
 from .SSHKey import SSHKey
 
+
 class DropletError(Error):
     """Base exception class for this module"""
     pass
 
+
 class BadKernelObject(DropletError):
     pass
 
+
 class BadSSHKeyFormat(DropletError):
     pass
 
+
 class Droplet(BaseAPI):
     """"Droplet managment
 
@@ -124,7 +127,7 @@ def load(self):
         droplet = droplets['droplet']
 
         for attr in droplet.keys():
-            setattr(self,attr,droplet[attr])
+            setattr(self, attr, droplet[attr])
 
         for net in self.networks['v4']:
             if net['type'] == 'private':
@@ -228,7 +231,7 @@ def restore(self, image_id):
         return self.get_data(
             "droplets/%s/actions/" % self.id,
             type="POST",
-            params={"type":"restore", "image": image_id}
+            params={"type": "restore", "image": image_id}
         )
 
     def rebuild(self, image_id=None):
@@ -315,7 +318,7 @@ def change_kernel(self, kernel):
         return self.get_data(
             "droplets/%s/actions/" % self.id,
             type="POST",
-            params={'type' : 'change_kernel', 'kernel': kernel.id}
+            params={'type': 'change_kernel', 'kernel': kernel.id}
         )
 
     def __get_ssh_keys_id(self):
@@ -327,7 +330,7 @@ def __get_ssh_keys_id(self):
         ssh_keys_id = list()
         for ssh_key in self.ssh_keys:
             if type(ssh_key) in [int, long]:
-                ssh_keys_id.append( int(ssh_key) )
+                ssh_keys_id.append(int(ssh_key))
 
             elif type(ssh_key) == SSHKey:
                 ssh_keys_id.append(ssh_key.id)
@@ -337,7 +340,7 @@ def __get_ssh_keys_id(self):
                 key.token = self.token
                 results = key.load_by_pub_key(ssh_key)
 
-                if results == None:
+                if results is None:
                     key.public_key = ssh_key
                     key.name = "SSH Key %s" % self.name
                     key.create()
@@ -346,7 +349,9 @@ def __get_ssh_keys_id(self):
 
                 ssh_keys_id.append(key.id)
             else:
-                raise BadSSHKeyFormat("Droplet.ssh_keys should be a list of IDs or public keys")
+                raise BadSSHKeyFormat(
+                    "Droplet.ssh_keys should be a list of IDs or public keys"
+                )
 
         return ssh_keys_id
 
@@ -358,19 +363,19 @@ def create(self, *args, **kwargs):
             assigned to the object.
         """
         for attr in kwargs.keys():
-            setattr(self,attr,kwargs[attr])
+            setattr(self, attr, kwargs[attr])
 
         # Provide backwards compatibility
         if not self.size_slug and self.size:
             self.size_slug = self.size
 
         data = {
-                "name": self.name,
-                "size": self.size_slug,
-                "image": self.image,
-                "region": self.region,
-                "ssh_keys[]": self.__get_ssh_keys_id(),
-            }
+            "name": self.name,
+            "size": self.size_slug,
+            "image": self.image,
+            "region": self.region,
+            "ssh_keys[]": self.__get_ssh_keys_id(),
+        }
 
         if self.backups:
             data['backups'] = True
@@ -463,7 +468,7 @@ def get_kernel_available(self):
                     if not url:
                             break
                     data = self.get_data(url)
-                except KeyError: # No links.
+                except KeyError:  # No links.
                     break
 
         return kernels

digitalocean/Image.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-import requests
 from .baseapi import BaseAPI
 
+
 class Image(BaseAPI):
     def __init__(self, *args, **kwargs):
         self.id = None
@@ -28,9 +28,9 @@ def load(self):
         data = self.get_data("images/%s" % self.id)
         image_dict = data['image']
 
-        #Setting the attribute values
+        # Setting the attribute values
         for attr in image_dict.keys():
-            setattr(self,attr,image_dict[attr])
+            setattr(self, attr, image_dict[attr])
 
         return self
 
@@ -64,4 +64,4 @@ def rename(self, new_name):
         )
 
     def __str__(self):
-        return "%s %s %s" % (self.id, self.name, self.distribution)
+        return "%s %s %s" % (self.id, self.name, self.distribution)

digitalocean/Kernel.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from .baseapi import BaseAPI
 
+
 class Kernel(BaseAPI):
     def __init__(self, *args, **kwargs):
         self.name = ""
@@ -9,4 +10,4 @@ def __init__(self, *args, **kwargs):
         super(Kernel, self).__init__(*args, **kwargs)
 
     def __str__(self):
-        return "%s %s" % (self.name, self.version)
+        return "%s %s" % (self.name, self.version)

digitalocean/Manager.py

@@ -45,7 +45,7 @@ def __deal_with_pagination(self, url, data, params):
                     values.append(value)
             data = {}
             data[key] = values
-        except KeyError: # No pages.
+        except KeyError:  # No pages.
             pass
 
         return data

digitalocean/Metadata.py

@@ -7,6 +7,7 @@
 
 from .baseapi import BaseAPI
 
+
 class Metadata(BaseAPI):
     """
         Metadata API: Provide useful information about the current Droplet.
@@ -37,9 +38,9 @@ def load(self):
         metadata = self.get_data("v1.json")
 
         for attr in metadata.keys():
-            setattr(self,attr,metadata[attr])
+            setattr(self, attr, metadata[attr])
 
         return self
 
     def __str__(self):
-        return "%s" % self.droplet_id
+        return "%s" % self.droplet_id

digitalocean/Record.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-import requests
 from .baseapi import BaseAPI
 
+
 class Record(BaseAPI):
     def __init__(self, domain_name=None, *args, **kwargs):
         self.domain = domain_name if domain_name else ""
@@ -29,13 +29,13 @@ def create(self):
             Create a record for a domain
         """
         input_params = {
-                "type": self.type,
-                "data": self.data,
-                "name": self.name,
-                "priority": self.priority,
-                "port": self.port,
-                "weight": self.weight
-            }
+            "type": self.type,
+            "data": self.data,
+            "name": self.name,
+            "priority": self.priority,
+            "port": self.port,
+            "weight": self.weight
+        }
 
         data = self.get_data(
             "domains/%s/records" % (self.domain),
@@ -79,9 +79,9 @@ def load(self):
         if record:
             record = record[u'domain_record']
 
-            #Setting the attribute values
+            # Setting the attribute values
             for attr in record.keys():
-                setattr(self,attr,record[attr])
+                setattr(self, attr, record[attr])
 
     def __str__(self):
         return "%s %s" % (self.id, self.domain)

digitalocean/Region.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from .baseapi import BaseAPI
 
+
 class Region(BaseAPI):
     def __init__(self, *args, **kwargs):
         self.name = None
@@ -11,4 +12,4 @@ def __init__(self, *args, **kwargs):
         super(Region, self).__init__(*args, **kwargs)
 
     def __str__(self):
-        return "%s" % self.name
+        return "%s" % self.name

digitalocean/SSHKey.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from .baseapi import BaseAPI
-import requests
+
 
 class SSHKey(BaseAPI):
     def __init__(self, *args, **kwargs):
@@ -28,9 +28,9 @@ def load(self):
 
         ssh_key = data['ssh_key']
 
-        #Setting the attribute values
+        # Setting the attribute values
         for attr in ssh_key.keys():
-            setattr(self,attr,ssh_key[attr])
+            setattr(self, attr, ssh_key[attr])
         self.id = ssh_key['id']
 
     def load_by_pub_key(self, public_key):
@@ -53,9 +53,9 @@ def create(self):
             Create the SSH Key
         """
         input_params = {
-                "name": self.name,
-                "public_key": self.public_key,
-            }
+            "name": self.name,
+            "public_key": self.public_key,
+        }
 
         data = self.get_data(
             "account/keys/",
@@ -71,9 +71,9 @@ def edit(self):
             Edit the SSH Key
         """
         input_params = {
-                "name": self.name,
-                "public_key": self.public_key,
-            }
+            "name": self.name,
+            "public_key": self.public_key,
+        }
 
         data = self.get_data(
             "account/keys/%s" % self.id,