projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 7167-keep-rsync-test-setup
[arvados.git]
/
sdk
/
python
/
arvados
/
errors.py
diff --git
a/sdk/python/arvados/errors.py
b/sdk/python/arvados/errors.py
index 3629520a4d5f7216a86a5b085585e4f0756b3581..bfd471ba52bee712a1e1768c91327ce28a9c6603 100644
(file)
--- a/
sdk/python/arvados/errors.py
+++ b/
sdk/python/arvados/errors.py
@@
-1,7
+1,6
@@
# errors.py - Arvados-specific exceptions.
import json
# errors.py - Arvados-specific exceptions.
import json
-import requests
from apiclient import errors as apiclient_errors
from collections import OrderedDict
from apiclient import errors as apiclient_errors
from collections import OrderedDict
@@
-46,7
+45,7
@@
class KeepRequestError(Exception):
self.message = message
def _format_error(self, key, error):
self.message = message
def _format_error(self, key, error):
- if isinstance(error,
requests.Response
):
+ if isinstance(error,
HttpError
):
err_fmt = "{} {} responded with {e.status_code} {e.reason}"
else:
err_fmt = "{} {} raised {e.__class__.__name__} ({e})"
err_fmt = "{} {} responded with {e.status_code} {e.reason}"
else:
err_fmt = "{} {} raised {e.__class__.__name__} ({e})"
@@
-61,6
+60,12
@@
class KeepRequestError(Exception):
return self._request_errors
return self._request_errors
+class HttpError(Exception):
+ def __init__(self, status_code, reason):
+ self.status_code = status_code
+ self.reason = reason
+
+
class ArgumentError(Exception):
pass
class SyntaxError(Exception):
class ArgumentError(Exception):
pass
class SyntaxError(Exception):