projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a11bbe0
)
Add support for ARVADOS_API_PORT.
author
Tim Pierce <twp@clinicalfuture.com>
Wed, 4 Dec 2013 20:50:58 +0000
(15:50 -0500)
committer
Tim Pierce <twp@clinicalfuture.com>
Wed, 4 Dec 2013 20:50:58 +0000
(15:50 -0500)
sdk/python/arvados.py
patch
|
blob
|
history
diff --git
a/sdk/python/arvados.py
b/sdk/python/arvados.py
index c1890c4da2058366523c66691fca7fe13b3a320f..dfe9ff65306e5d9a506011ed3a879d910d576348 100644
(file)
--- a/
sdk/python/arvados.py
+++ b/
sdk/python/arvados.py
@@
-46,8
+46,10
@@
class CredentialsFromEnv(object):
http.request = types.MethodType(self.http_request, http)
return http
-url = ('https://%s/discovery/v1/apis/'
- '{api}/{apiVersion}/rest' % os.environ['ARVADOS_API_HOST'])
+url = ('https://%s:%s/discovery/v1/apis/'
+ '{api}/{apiVersion}/rest' %
+ (os.environ['ARVADOS_API_HOST'],
+ os.environ.get('ARVADOS_API_PORT') or "443"))
credentials = CredentialsFromEnv()
# Use system's CA certificates (if we find them) instead of httplib2's