From: Tim Pierce <twp@clinicalfuture.com>
Date: Wed, 4 Dec 2013 20:50:58 +0000 (-0500)
Subject: Add support for ARVADOS_API_PORT.
X-Git-Tag: 1.1.0~2863^2~6
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/8760fa366644c55e02c06010ce3add645f207a18

Add support for ARVADOS_API_PORT.
---

diff --git a/sdk/python/arvados.py b/sdk/python/arvados.py
index c1890c4da2..dfe9ff6530 100644
--- 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