Skip to content

Commit

Permalink
new version
Browse files Browse the repository at this point in the history
  • Loading branch information
joamag committed Sep 5, 2017
1 parent eb4a2a0 commit adc591e
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -42,7 +42,7 @@

setuptools.setup(
name = "digitalocean_api_python",
version = "0.1.2",
version = "0.1.3",
author = "Hive Solutions Lda.",
author_email = "development@hive.pt",
description = "DigitalOcean API Client",
Expand Down
6 changes: 3 additions & 3 deletions src/digitalocean/__init__.py
Expand Up @@ -38,6 +38,6 @@
from . import base
from . import droplet

from .action import ActionApi
from .base import BASE_URL, Api
from .droplet import DropletApi
from .action import ActionAPI
from .base import BASE_URL, API
from .droplet import DropletAPI
2 changes: 1 addition & 1 deletion src/digitalocean/action.py
Expand Up @@ -37,7 +37,7 @@
__license__ = "Apache License, Version 2.0"
""" The license for the module """

class ActionApi(object):
class ActionAPI(object):

def list_actions(self):
url = self.base_url + "actions"
Expand Down
10 changes: 5 additions & 5 deletions src/digitalocean/base.py
Expand Up @@ -69,14 +69,14 @@
""" The list of permissions to be used to create the
scope string for the oauth value """

class Api(
appier.OAuth2Api,
action.ActionApi,
droplet.DropletApi
class API(
appier.OAuth2API,
action.ActionAPI,
droplet.DropletAPI
):

def __init__(self, *args, **kwargs):
appier.OAuth2Api.__init__(self, *args, **kwargs)
appier.OAuth2API.__init__(self, *args, **kwargs)
self.client_id = appier.conf("DO_ID", CLIENT_ID)
self.client_secret = appier.conf("DO_SECRET", CLIENT_SECRET)
self.redirect_url = appier.conf("DO_REDIRECT_URL", REDIRECT_URL)
Expand Down
2 changes: 1 addition & 1 deletion src/digitalocean/droplet.py
Expand Up @@ -37,7 +37,7 @@
__license__ = "Apache License, Version 2.0"
""" The license for the module """

class DropletApi(object):
class DropletAPI(object):

def list_droplets(self):
url = self.base_url + "droplets"
Expand Down
2 changes: 1 addition & 1 deletion src/examples/base.py
Expand Up @@ -42,7 +42,7 @@
import digitalocean

def get_api():
return digitalocean.Api(
return digitalocean.API(
client_id = appier.conf("DO_ID"),
client_secret = appier.conf("DO_SECRET"),
redirect_url = appier.conf("DO_REDIRECT_URL")
Expand Down

0 comments on commit adc591e

Please sign in to comment.