projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18027-unmount-fuse'
[arvados.git]
/
sdk
/
python
/
arvados
/
api.py
diff --git
a/sdk/python/arvados/api.py
b/sdk/python/arvados/api.py
index b18ce25fd218201ab75f4b3c14f9c7b66f84f373..86d24dfc06a7edf8cf73ac315904f8b4bfb3a908 100644
(file)
--- a/
sdk/python/arvados/api.py
+++ b/
sdk/python/arvados/api.py
@@
-14,6
+14,7
@@
import logging
import os
import re
import socket
import os
import re
import socket
+import sys
import time
import types
import time
import types
@@
-32,6
+33,9
@@
RETRY_DELAY_INITIAL = 2
RETRY_DELAY_BACKOFF = 2
RETRY_COUNT = 2
RETRY_DELAY_BACKOFF = 2
RETRY_COUNT = 2
+if sys.version_info >= (3,):
+ httplib2.SSLHandshakeError = None
+
class OrderedJsonModel(apiclient.model.JsonModel):
"""Model class for JSON that preserves the contents' order.
class OrderedJsonModel(apiclient.model.JsonModel):
"""Model class for JSON that preserves the contents' order.
@@
-207,7
+211,8
@@
def api(version=None, cache=True, host=None, token=None, insecure=False,
pass
elif not host and not token:
return api_from_config(
pass
elif not host and not token:
return api_from_config(
- version=version, cache=cache, request_id=request_id, **kwargs)
+ version=version, cache=cache, timeout=timeout,
+ request_id=request_id, **kwargs)
else:
# Caller provided one but not the other
if not host:
else:
# Caller provided one but not the other
if not host:
@@
-237,6
+242,7
@@
def api(version=None, cache=True, host=None, token=None, insecure=False,
svc.api_token = token
svc.insecure = insecure
svc.request_id = request_id
svc.api_token = token
svc.insecure = insecure
svc.request_id = request_id
+ svc.config = lambda: util.get_config_once(svc)
kwargs['http'].max_request_size = svc._rootDesc.get('maxRequestSize', 0)
kwargs['http'].cache = None
kwargs['http']._request_id = lambda: svc.request_id or util.new_request_id()
kwargs['http'].max_request_size = svc._rootDesc.get('maxRequestSize', 0)
kwargs['http'].cache = None
kwargs['http']._request_id = lambda: svc.request_id or util.new_request_id()