projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
17717: Merge branch 'master' into 17717-costanalyzer-date-mode
[arvados.git]
/
sdk
/
python
/
arvados
/
errors.py
diff --git
a/sdk/python/arvados/errors.py
b/sdk/python/arvados/errors.py
index bfd471ba52bee712a1e1768c91327ce28a9c6603..4fe1f76543a356f1c36aafea23efbc5895088c87 100644
(file)
--- a/
sdk/python/arvados/errors.py
+++ b/
sdk/python/arvados/errors.py
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
# errors.py - Arvados-specific exceptions.
import json
# errors.py - Arvados-specific exceptions.
import json
@@
-8,7
+12,7
@@
from collections import OrderedDict
class ApiError(apiclient_errors.HttpError):
def _get_reason(self):
try:
class ApiError(apiclient_errors.HttpError):
def _get_reason(self):
try:
- return '; '.join(json.loads(self.content)['errors'])
+ return '; '.join(json.loads(self.content
.decode('utf-8')
)['errors'])
except (KeyError, TypeError, ValueError):
return super(ApiError, self)._get_reason()
except (KeyError, TypeError, ValueError):
return super(ApiError, self)._get_reason()
@@
-37,7
+41,7
@@
class KeepRequestError(Exception):
self._request_errors = OrderedDict(request_errors)
if self._request_errors:
exc_reports = [self._format_error(*err_pair)
self._request_errors = OrderedDict(request_errors)
if self._request_errors:
exc_reports = [self._format_error(*err_pair)
- for err_pair in self._request_errors.ite
rite
ms()]
+ for err_pair in self._request_errors.items()]
base_msg = "{}: {}".format(message, "; ".join(exc_reports))
else:
base_msg = message
base_msg = "{}: {}".format(message, "; ".join(exc_reports))
else:
base_msg = message