projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
3198: Support for mkdir, rmdir, unlink, rename. Improve exception catching.
[arvados.git]
/
sdk
/
python
/
arvados
/
api.py
diff --git
a/sdk/python/arvados/api.py
b/sdk/python/arvados/api.py
index 6103babe8365db27fdd2c0b71cb54cc1ee08f66e..3968f0185e1a193a6b233c5033be4a0b7ad8794e 100644
(file)
--- a/
sdk/python/arvados/api.py
+++ b/
sdk/python/arvados/api.py
@@
-14,7
+14,7
@@
import util
_logger = logging.getLogger('arvados.api')
_logger = logging.getLogger('arvados.api')
-def intercept_http_request(self, uri, **kwargs):
+def
_
intercept_http_request(self, uri, **kwargs):
from httplib import BadStatusLine
if (self.max_request_size and
from httplib import BadStatusLine
if (self.max_request_size and
@@
-40,11
+40,11
@@
def intercept_http_request(self, uri, **kwargs):
# risky.
return self.orig_http_request(uri, **kwargs)
# risky.
return self.orig_http_request(uri, **kwargs)
-def patch_http_request(http, api_token):
+def
_
patch_http_request(http, api_token):
http.arvados_api_token = api_token
http.max_request_size = 0
http.orig_http_request = http.request
http.arvados_api_token = api_token
http.max_request_size = 0
http.orig_http_request = http.request
- http.request = types.MethodType(intercept_http_request, http)
+ http.request = types.MethodType(
_
intercept_http_request, http)
return http
# Monkey patch discovery._cast() so objects and arrays get serialized
return http
# Monkey patch discovery._cast() so objects and arrays get serialized
@@
-145,7
+145,7
@@
def api(version=None, cache=True, host=None, token=None, insecure=False, **kwarg
http_kwargs['disable_ssl_certificate_validation'] = True
kwargs['http'] = httplib2.Http(**http_kwargs)
http_kwargs['disable_ssl_certificate_validation'] = True
kwargs['http'] = httplib2.Http(**http_kwargs)
- kwargs['http'] = patch_http_request(kwargs['http'], token)
+ kwargs['http'] =
_
patch_http_request(kwargs['http'], token)
svc = apiclient_discovery.build('arvados', version, **kwargs)
svc.api_token = token
svc = apiclient_discovery.build('arvados', version, **kwargs)
svc.api_token = token