Skip to content

Improve error handling in ApiClient #2

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improve error handling in ApiClient #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions mailchimp_transactional/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@
import requests
import json


class ApiClientError(Exception):
def __init__(self, text, status_code):
self.text = text
self.status_code = status_code


class ApiClient(object):
def __init__(self):
self.host = "https://mandrillapp.com/api/1.0"
Expand Down Expand Up @@ -61,19 +63,24 @@ def call_api(self, resource_path, method, header_params=None, body=None, **kwarg
# perform request and return response
res = self.request(method, url, body, headers)

try:
res.raise_for_status()
except requests.exceptions.HTTPError:
raise ApiClientError(text=res.text, status_code=res.status_code)

try:
if 'application/json' in res.headers.get('content-type'):
data = res.json()
else:
data = res.text
except Exception as err:
except Exception:
data = None

if data:
if (res.ok):
return data
else:
raise ApiClientError(text = data, status_code = res.status_code)
raise ApiClientError(text=data, status_code=res.status_code)
else:
return res

Expand All @@ -86,4 +93,4 @@ def request(self, method, url, body=None, headers=None, timeout=None):
else:
raise ValueError(
"http method must be `POST`"
)
)