openstack/deb-python-cinderclient
Code Issues Proposed changes

Merge "Handle error response for webob>=1.6.0"

Browse Source
This commit is contained in:
Jenkins 2016-12-11 23:16:36 +00:00 committed by Gerrit Code Review
commit 702988b8b9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cinderclient/exceptions.py
View File

@ -242,9 +242,14 @@ def from_response(response, body):
message = "n/a"
details = "n/a"
if hasattr(body, 'keys'):
error = body[list(body)[0]]
message = error.get('message', message)
details = error.get('details', details)
# Only in webob>=1.6.0
if 'message' in body:
message = body.get('message')
details = body.get('details')
else:
error = body[list(body)[0]]
message = error.get('message', message)
details = error.get('details', details)
return cls(code=response.status_code, message=message, details=details,
request_id=request_id, response=response)
else: