summaryrefslogtreecommitdiff
path: root/gitlab
diff options
context:
space:
mode:
authorGauvain Pocentek <gauvain@pocentek.net>2017-09-19 23:09:20 +0200
committerGauvain Pocentek <gauvain@pocentek.net>2017-09-19 23:09:20 +0200
commite35563ede40241a4acf3341edea7e76362a2eaec (patch)
treebcaef37db04495ddb3b69fec72082d274a798af9 /gitlab
parente09581fccba625e4a0cf9eb67de2a9471fce3b9d (diff)
downloadgitlab-e35563ede40241a4acf3341edea7e76362a2eaec.tar.gz
Exceptions: use a proper error message
Diffstat (limited to 'gitlab')
-rw-r--r--gitlab/__init__.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
index a936816..cc3eb2a 100644
--- a/gitlab/__init__.py
+++ b/gitlab/__init__.py
@@ -685,13 +685,18 @@ class Gitlab(object):
if 200 <= result.status_code < 300:
return result
+ try:
+ error_message = result.json()['message']
+ except Exception as e:
+ error_message = result.content
+
if result.status_code == 401:
raise GitlabAuthenticationError(response_code=result.status_code,
- error_message=result.content,
+ error_message=error_message,
response_body=result.content)
raise GitlabHttpError(response_code=result.status_code,
- error_message=result.content,
+ error_message=error_message,
response_body=result.content)
def http_get(self, path, query_data={}, streamed=False, **kwargs):