10343: Merge branch 'master' into 10343-dockercleaner-config

[arvados.git] / sdk / python / arvados / safeapi.py

diff --git a/sdk/python/arvados/safeapi.py b/sdk/python/arvados/safeapi.py
index 32cb2a543d12d78bccfd797e65a287407d58e595..5c5c87250ac678f9b9bf93cbf56cb335707c6554 100644 (file)
--- a/sdk/python/arvados/safeapi.py
+++ b/sdk/python/arvados/safeapi.py
@@ -5,9 +5,11 @@ import config
 import copy
 
 class ThreadSafeApiCache(object):
-    """Threadsafe wrapper for API objects.  This stores and returns a different api
-    object per thread, because httplib2 which underlies apiclient is not
-    threadsafe.
+    """Threadsafe wrapper for API objects.
+
+    This stores and returns a different api object per thread, because httplib2
+    which underlies apiclient is not threadsafe.
+
     """
 
     def __init__(self, apiconfig=None, keep_params={}):
@@ -19,7 +21,7 @@ class ThreadSafeApiCache(object):
 
     def localapi(self):
         if 'api' not in self.local.__dict__:
-            self.local.api = api.api('v1', False, apiconfig=self.apiconfig)
+            self.local.api = api.api_from_config('v1', apiconfig=self.apiconfig)
         return self.local.api
 
     def __getattr__(self, name):