diff options
| -rw-r--r-- | monikerclient/v1/__init__.py | 2 | ||||
| -rw-r--r-- | monikerclient/v1/domains.py | 8 | ||||
| -rw-r--r-- | monikerclient/v1/records.py | 8 | ||||
| -rw-r--r-- | monikerclient/v1/servers.py | 8 | ||||
| -rw-r--r-- | tools/pip-requires | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/monikerclient/v1/__init__.py b/monikerclient/v1/__init__.py index 1eda3f5..dac1475 100644 --- a/monikerclient/v1/__init__.py +++ b/monikerclient/v1/__init__.py @@ -72,7 +72,7 @@ class Client(object): response = func(*args, **kw) if response.status_code == 400: - raise exceptions.BadRequest(response.json()['errors']) + raise exceptions.BadRequest(response.json['errors']) elif response.status_code in (401, 403): raise exceptions.Forbidden() elif response.status_code == 404: diff --git a/monikerclient/v1/domains.py b/monikerclient/v1/domains.py index bba5b8d..b555105 100644 --- a/monikerclient/v1/domains.py +++ b/monikerclient/v1/domains.py @@ -31,7 +31,7 @@ class DomainsController(Controller): """ response = self.client.get('/domains') - return [Domain(i) for i in response.json()['domains']] + return [Domain(i) for i in response.json['domains']] def get(self, domain_id): """ @@ -42,7 +42,7 @@ class DomainsController(Controller): """ response = self.client.get('/domains/%s' % domain_id) - return Domain(response.json()) + return Domain(response.json) def create(self, domain): """ @@ -53,7 +53,7 @@ class DomainsController(Controller): """ response = self.client.post('/domains', data=json.dumps(domain)) - return Domain(response.json()) + return Domain(response.json) def update(self, domain): """ @@ -65,7 +65,7 @@ class DomainsController(Controller): response = self.client.put('/domains/%s' % domain.id, data=json.dumps(domain.changes)) - return Domain(response.json()) + return Domain(response.json) def delete(self, domain): """ diff --git a/monikerclient/v1/records.py b/monikerclient/v1/records.py index 43ae854..f9ab584 100644 --- a/monikerclient/v1/records.py +++ b/monikerclient/v1/records.py @@ -37,7 +37,7 @@ class RecordsController(Controller): 'domain_id': domain_id }) - return [Record(i) for i in response.json()['records']] + return [Record(i) for i in response.json['records']] def get(self, domain, record_id): """ @@ -56,7 +56,7 @@ class RecordsController(Controller): response = self.client.get(uri) - return Record(response.json()) + return Record(response.json) def create(self, domain, record): """ @@ -74,7 +74,7 @@ class RecordsController(Controller): response = self.client.post(uri, data=json.dumps(record)) - return Record(response.json()) + return Record(response.json) def update(self, domain, record): """ @@ -93,7 +93,7 @@ class RecordsController(Controller): response = self.client.put(uri, data=json.dumps(record.changes)) - return Record(response.json()) + return Record(response.json) def delete(self, domain, record): """ diff --git a/monikerclient/v1/servers.py b/monikerclient/v1/servers.py index 1794728..9be9189 100644 --- a/monikerclient/v1/servers.py +++ b/monikerclient/v1/servers.py @@ -31,7 +31,7 @@ class ServersController(Controller): """ response = self.client.get('/servers') - return [Server(i) for i in response.json()['servers']] + return [Server(i) for i in response.json['servers']] def get(self, server_id): """ @@ -42,7 +42,7 @@ class ServersController(Controller): """ response = self.client.get('/servers/%s' % server_id) - return Server(response.json()) + return Server(response.json) def create(self, server): """ @@ -53,7 +53,7 @@ class ServersController(Controller): """ response = self.client.post('/servers', data=json.dumps(server)) - return Server(response.json()) + return Server(response.json) def update(self, server): """ @@ -65,7 +65,7 @@ class ServersController(Controller): response = self.client.put('/servers/%s' % server.id, data=json.dumps(server.changes)) - return Server(response.json()) + return Server(response.json) def delete(self, server): """ diff --git a/tools/pip-requires b/tools/pip-requires index 2b8b1d2..dbfd671 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,4 +1,4 @@ cliff>=1.2.1 jsonschema>=0.7 -requests>1.0 +requests>=0.8.3,<1.0 python-keystoneclient>=0.2.0 |