projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '8784-dir-listings'
[arvados.git]
/
sdk
/
python
/
arvados
/
api.py
diff --git
a/sdk/python/arvados/api.py
b/sdk/python/arvados/api.py
index 59a73b45e558d5433776eed89a8f198345fd65b2..6581a8e9acb59bbd81eb57997550d82543887b53 100644
(file)
--- a/
sdk/python/arvados/api.py
+++ b/
sdk/python/arvados/api.py
@@
-48,7
+48,7
@@
class OrderedJsonModel(apiclient.model.JsonModel):
return body
return body
-def _intercept_http_request(self, uri, **kwargs):
+def _intercept_http_request(self, uri,
method="GET",
**kwargs):
if (self.max_request_size and
kwargs.get('body') and
self.max_request_size < len(kwargs['body'])):
if (self.max_request_size and
kwargs.get('body') and
self.max_request_size < len(kwargs['body'])):
@@
-62,7
+62,7
@@
def _intercept_http_request(self, uri, **kwargs):
kwargs['headers']['Authorization'] = 'OAuth2 %s' % self.arvados_api_token
kwargs['headers']['Authorization'] = 'OAuth2 %s' % self.arvados_api_token
- retryable =
kwargs.get('method', 'GET')
in [
+ retryable =
method
in [
'DELETE', 'GET', 'HEAD', 'OPTIONS', 'PUT']
retry_count = self._retry_count if retryable else 0
'DELETE', 'GET', 'HEAD', 'OPTIONS', 'PUT']
retry_count = self._retry_count if retryable else 0
@@
-79,7
+79,7
@@
def _intercept_http_request(self, uri, **kwargs):
for _ in range(retry_count):
self._last_request_time = time.time()
try:
for _ in range(retry_count):
self._last_request_time = time.time()
try:
- return self.orig_http_request(uri, **kwargs)
+ return self.orig_http_request(uri,
method,
**kwargs)
except http.client.HTTPException:
_logger.debug("Retrying API request in %d s after HTTP error",
delay, exc_info=True)
except http.client.HTTPException:
_logger.debug("Retrying API request in %d s after HTTP error",
delay, exc_info=True)
@@
-97,7
+97,7
@@
def _intercept_http_request(self, uri, **kwargs):
delay = delay * self._retry_delay_backoff
self._last_request_time = time.time()
delay = delay * self._retry_delay_backoff
self._last_request_time = time.time()
- return self.orig_http_request(uri, **kwargs)
+ return self.orig_http_request(uri,
method,
**kwargs)
def _patch_http_request(http, api_token):
http.arvados_api_token = api_token
def _patch_http_request(http, api_token):
http.arvados_api_token = api_token
@@
-117,6
+117,7
@@
_cast_orig = apiclient_discovery._cast
def _cast_objects_too(value, schema_type):
global _cast_orig
if (type(value) != type('') and
def _cast_objects_too(value, schema_type):
global _cast_orig
if (type(value) != type('') and
+ type(value) != type(b'') and
(schema_type == 'object' or schema_type == 'array')):
return json.dumps(value)
else:
(schema_type == 'object' or schema_type == 'array')):
return json.dumps(value)
else: