openstack
/
python-magnumclient
Code Issues Proposed changes

Fix failing to parse json error msg 

It assumes its a requests response but could
be a HTTPResponse from urllib.

Story: 2008789
Task: 42183

Change-Id: I7306d167a17284c7f478ec1c1599a8d4b32040c2
(cherry picked from commit f7551a6bac)
This commit is contained in:
Tobias Urdin 2020-11-18 11:46:44 +01:00
parent e2bcf6e980
commit 280acd2dff
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
magnumclient/common/httpclient.py
View File

@ -69,6 +69,9 @@ def _extract_error_json(body, resp):
try: try:
body_json = resp.json() body_json = resp.json()
return _extract_error_json_text(body_json) return _extract_error_json_text(body_json)
except AttributeError:
body_json = jsonutils.loads(body)
return _extract_error_json_text(body_json)
except ValueError: except ValueError:
return {} return {}
else: else: