|
4 | 4 |
|
5 | 5 | import requests
|
6 | 6 | from oauthlib.oauth1 import SIGNATURE_RSA
|
| 7 | +from requests import HTTPError |
7 | 8 | from requests_oauthlib import OAuth1, OAuth2
|
8 | 9 | from six.moves.urllib.parse import urlencode
|
9 |
| -from requests import HTTPError |
| 10 | + |
10 | 11 | from atlassian.request_utils import get_default_logger
|
11 | 12 |
|
12 | 13 | log = get_default_logger(__name__)
|
@@ -94,7 +95,7 @@ def _create_token_session(self, token):
|
94 | 95 | self._update_header("Authorization", "Bearer {token}".format(token=token))
|
95 | 96 |
|
96 | 97 | def _create_kerberos_session(self, _):
|
97 |
| - from requests_kerberos import HTTPKerberosAuth, OPTIONAL |
| 98 | + from requests_kerberos import OPTIONAL, HTTPKerberosAuth |
98 | 99 |
|
99 | 100 | self._session.auth = HTTPKerberosAuth(mutual_authentication=OPTIONAL)
|
100 | 101 |
|
@@ -392,9 +393,12 @@ def raise_for_status(self, response):
|
392 | 393 | if 400 <= response.status_code < 600:
|
393 | 394 | try:
|
394 | 395 | j = response.json()
|
395 |
| - error_msg = "\n".join( |
396 |
| - j.get("errorMessages", list()) + [k + ": " + v for k, v in j.get("errors", dict()).items()] |
397 |
| - ) |
| 396 | + if self.url == "https://api.atlassian.com": |
| 397 | + error_msg = "\n".join([k + ": " + v for k, v in j.items()]) |
| 398 | + else: |
| 399 | + error_msg = "\n".join( |
| 400 | + j.get("errorMessages", list()) + [k + ": " + v for k, v in j.get("errors", dict()).items()] |
| 401 | + ) |
398 | 402 | except Exception:
|
399 | 403 | response.raise_for_status()
|
400 | 404 | else:
|
|
0 commit comments