[Python-modules-commits] [python-digitalocean] 01/01: Imported Upstream version 1.6

[Andrew Starr-Bochicchio]

This is an automated email from the git hooks/post-receive script.

asb pushed a commit to annotated tag upstream/1.6
in repository python-digitalocean.

commit bfd747e417a6ec97125554792020c90957fecce0
Author: Andrew Starr-Bochicchio <a.starr.b at gmail.com>
Date:   Tue Oct 13 21:03:03 2015 -0400

    Imported Upstream version 1.6
---
 digitalocean/Account.py                      | 2 --
 digitalocean/Domain.py                       | 7 ++-----
 digitalocean/Droplet.py                      | 6 +++++-
 digitalocean/tests/data/account/account.json | 4 +---
 digitalocean/tests/test_manager.py           | 1 -
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/digitalocean/Account.py b/digitalocean/Account.py
index 3a7da66..4faf657 100644
--- a/digitalocean/Account.py
+++ b/digitalocean/Account.py
@@ -8,8 +8,6 @@ class Account(BaseAPI):
         self.email = None
         self.uuid = None
         self.email_verified = None
-        self.status = None
-        self.status_message = None
 
         super(Account, self).__init__(*args, **kwargs)
 
diff --git a/digitalocean/Domain.py b/digitalocean/Domain.py
index 5507d27..6864d51 100644
--- a/digitalocean/Domain.py
+++ b/digitalocean/Domain.py
@@ -88,16 +88,13 @@ class Domain(BaseAPI):
         domain = self.get_data("domains", type=POST, params=data)
         return domain
 
-    def get_records(self, params=None):
+    def get_records(self):
         """
             Returns a list of Record objects
         """
-        if params is None:
-            params = {}
-        
         # URL https://api.digitalocean.com/v2/domains/[NAME]/records/
         records = []
-        data = self.get_data("domains/%s/records/" % self.name, type=GET, params=params)
+        data = self.get_data("domains/%s/records/" % self.name, type=GET)
 
         for record_data in data['domain_records']:
 
diff --git a/digitalocean/Droplet.py b/digitalocean/Droplet.py
index 1e7c9e6..3db2b76 100644
--- a/digitalocean/Droplet.py
+++ b/digitalocean/Droplet.py
@@ -343,7 +343,11 @@ class Droplet(BaseAPI):
         """
             Destroy the droplet
 
-            Returns dict
+            Optional Args:
+                return_dict - bool : Return a dict when True (default),
+                    otherwise return an Action.
+
+            Returns dict or Action
         """
         return self.get_data("droplets/%s" % self.id, type=DELETE)
 
diff --git a/digitalocean/tests/data/account/account.json b/digitalocean/tests/data/account/account.json
index 59946cf..2d1a58e 100644
--- a/digitalocean/tests/data/account/account.json
+++ b/digitalocean/tests/data/account/account.json
@@ -3,8 +3,6 @@
     "droplet_limit": 25,
     "email": "web at digitalocean.com",
     "uuid": "b6fc48dbf6d9906cace5f3c78dc9851e757381ef",
-    "email_verified": true,
-    "status": "active",
-    "status_message": ""
+    "email_verified": true
   }
 }
\ No newline at end of file
diff --git a/digitalocean/tests/test_manager.py b/digitalocean/tests/test_manager.py
index c0a274c..24132d7 100644
--- a/digitalocean/tests/test_manager.py
+++ b/digitalocean/tests/test_manager.py
@@ -30,7 +30,6 @@ class TestManager(BaseTest):
         self.assertEqual(acct.email, 'web at digitalocean.com')
         self.assertEqual(acct.droplet_limit, 25)
         self.assertEqual(acct.email_verified, True)
-        self.assertEqual(acct.status, "active")
 
     @responses.activate
     def test_auth_fail(self):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-digitalocean.git