Skip to content

Catch ValueError in api_call decorator #5

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

Merged
jkeyes merged 1 commit into from
Feb 25, 2013
Merged

Catch ValueError in api_call decorator #5

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion intercom/intercom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ def wrapper(*args, **kwargs):
response = func_to_decorate(*args, **kwargs)
if response.status_code == 401:
raise AuthenticationError("Invalid API key/username provided.")
result = json.loads(response.content)
try:
result = json.loads(response.content)
except ValueError as err:
raise ServerError(err.message)
if response.status_code in (200, 201):
pass
else:
Expand Down
Empty file added tests/unit/fixtures/invalid.json
View file
Open in desktop
Empty file.
5 changes: 5 additions & 0 deletions tests/unit/test_intercom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,8 @@ def test_not_found(self):
@patch('requests.request', create_response(500, '500.json'))
def test_api_error(self):
resp = Intercom.get_users()

@raises(ServerError)
@patch('requests.request', create_response(500, 'invalid.json'))
def test_api_error_when_json_is_invalid(self):
Intercom.get_users()