Skip to content

Dev #1092

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Dev #1092

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1d9a52
Added more exception handling.
Jan 31, 2019
3b5c37f
Formating changes.
Jan 31, 2019
ba14a92
More minor changes.
Jan 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions SoftLayer/transports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,12 @@ def __call__(self, request):
request.url = resp.url

resp.raise_for_status()
result = json.loads(resp.text)

if resp.text != "":
result = json.loads(resp.text)
else:
raise exceptions.SoftLayerAPIError(resp.status_code, "Empty response.")

request.result = result

if isinstance(result, list):
Expand All @@ -388,9 +393,15 @@ def __call__(self, request):
else:
return result
except requests.HTTPError as ex:
message = json.loads(ex.response.text)['error']
request.url = ex.response.url
raise exceptions.SoftLayerAPIError(ex.response.status_code, message)
try:
message = json.loads(ex.response.text)['error']
request.url = ex.response.url
except Exception:
if ex.response.text == "":
raise exceptions.SoftLayerAPIError(resp.status_code, "Empty response.")
else:
raise exceptions.SoftLayerAPIError(resp.status_code, ex.response.text)
raise exceptions.SoftLayerAPIError(ex.response.status_code, message)
except requests.RequestException as ex:
raise exceptions.TransportError(0, str(ex))

Expand Down