Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions datamaxi/_dispatch.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ def raise_for_error(status_code, text, headers):
try:
err = json.loads(text)
except JSONDecodeError:
raise ClientError(status_code, text, None, headers)
raise ClientError(status_code, text, None, headers) from None
error_data = None
if "data" in err:
error_data = err["data"]
raise ClientError(status_code, err["error"], headers, error_data)
raise ClientError(status_code, err.get("error", text), headers, error_data)
raise ServerError(status_code, text)


Expand Down
2 changes: 2 additions & 0 deletions datamaxi/error.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@ def __init__(self, status_code, error_message, header, error_data=None):
self.header = header
# return data if it's returned from server
self.error_data = error_data
super().__init__(f"{status_code}: {error_message}")


class ServerError(Error):
def __init__(self, status_code, message):
self.status_code = status_code
self.message = message
super().__init__(f"{status_code}: {message}")


class ParameterRequiredError(Error):
Expand Down
2 changes: 1 addition & 1 deletion datamaxi/lib/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def check_at_least_one_set_parameters(params):
check_required_parameter(p[0], p[1])
at_least_one_set = True
break
except: # noqa: E722
except ParameterRequiredError:
pass

if not at_least_one_set:
Expand Down
Loading