openstack/python-novaclient
Code Issues Proposed changes

Merge "py33: 'dict_keys' object does not support indexing"

Browse Source
This commit is contained in:
Jenkins 2013-09-24 00:23:01 +00:00 committed by Gerrit Code Review
commit 935e1fe167
3 changed files with 3 additions and 3 deletions
novaclient
exceptions.py
tests/v1_1
contrib
fakes.py
fakes.py

2
novaclient/exceptions.py

@ -206,7 +206,7 @@ def from_response(response, body, url, method=None):
details = "n/a" details = "n/a"
if hasattr(body, 'keys'): if hasattr(body, 'keys'):
error = body[body.keys()[0]] error = body[list(body)[0]]
message = error.get('message', None) message = error.get('message', None)
details = error.get('details', None) details = error.get('details', None)

2
novaclient/tests/v1_1/contrib/fakes.py

@ -113,7 +113,7 @@ class FakeHTTPClient(fakes.FakeHTTPClient):
def post_os_baremetal_nodes_1_action(self, **kw): def post_os_baremetal_nodes_1_action(self, **kw):
body = kw['body'] body = kw['body']
action = body.keys()[0] action = list(body)[0]
if action == "add_interface": if action == "add_interface":
return ( return (
200, {}, { 200, {}, {

2
novaclient/tests/v1_1/fakes.py

@ -488,7 +488,7 @@ class FakeHTTPClient(base_client.HTTPClient):
_body = None _body = None
resp = 202 resp = 202
assert len(body.keys()) == 1 assert len(body.keys()) == 1
action = body.keys()[0] action = list(body)[0]
if action == 'reboot': if action == 'reboot':
assert body[action].keys() == ['type'] assert body[action].keys() == ['type']
assert body[action]['type'] in ['HARD', 'SOFT'] assert body[action]['type'] in ['HARD', 'SOFT']