Skip to content

Improve error message handling in exceptions #641

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
max-wittig merged 1 commit into from
Nov 28, 2018
Merged

Improve error message handling in exceptions #641

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
8 changes: 6 additions & 2 deletions gitlab/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,10 +490,14 @@ def http_request(self, verb, path, query_data={}, post_data=None,
time.sleep(wait_time)
continue

error_message = result.content
try:
error_message = result.json()['message']
error_json = result.json()
for k in ('message', 'error'):
if k in error_json:
error_message = error_json[k]
except (KeyError, ValueError, TypeError):
error_message = result.content
pass

if result.status_code == 401:
raise GitlabAuthenticationError(
Expand Down
7 changes: 6 additions & 1 deletion gitlab/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,12 @@ def __init__(self, error_message="", response_code=None,
# Full http response
self.response_body = response_body
# Parsed error message from gitlab
self.error_message = error_message
try:
# if we receive str/bytes we try to convert to unicode/str to have
# consistent message types (see #616)
self.error_message = error_message.decode()
except Exception:
self.error_message = error_message

def __str__(self):
if self.response_code is not None:
Expand Down