Repository navigation
Commit 1fb1296
Gauvain Pocentek
Improve error message handling in exceptions
* Depending on the request Gitlab has a 'message' or 'error' attribute
in the json data, handle both
* Add some consistency by converting messages to unicode or str for
exceptions (depending on the python version)
Closes #6161 parent 011274e commit 1fb1296
2 files changed
Lines changed: 12 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -490,10 +490,14 @@ def http_request(self, verb, path, query_data={}, post_data=None, | |||
| 490 | 490 | time.sleep(wait_time) | |
| 491 | 491 | continue | |
| 492 | 492 | ||
| 493 | + error_message = result.content | ||
| 493 | 494 | try: | |
| 494 | - error_message = result.json()['message'] | ||
| 495 | + error_json = result.json() | ||
| 496 | + for k in ('message', 'error'): | ||
| 497 | + if k in error_json: | ||
| 498 | + error_message = error_json[k] | ||
| 495 | 499 | except (KeyError, ValueError, TypeError): | |
| 496 | - error_message = result.content | ||
| 500 | + pass | ||
| 497 | 501 | ||
| 498 | 502 | if result.status_code == 401: | |
| 499 | 503 | raise GitlabAuthenticationError( | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -28,7 +28,12 @@ def __init__(self, error_message="", response_code=None, | |||
| 28 | 28 | # Full http response | |
| 29 | 29 | self.response_body = response_body | |
| 30 | 30 | # Parsed error message from gitlab | |
| 31 | - self.error_message = error_message | ||
| 31 | + try: | ||
| 32 | + # if we receive str/bytes we try to convert to unicode/str to have | ||
| 33 | + # consistent message types (see #616) | ||
| 34 | + self.error_message = error_message.decode() | ||
| 35 | + except Exception: | ||
| 36 | + self.error_message = error_message | ||
| 32 | 37 | ||
| 33 | 38 | def __str__(self): | |
| 34 | 39 | if self.response_code is not None: | |
0 commit comments