11158: Fixes & test updates for ProjectDirectory.

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

diff --git a/sdk/python/arvados/safeapi.py b/sdk/python/arvados/safeapi.py
index baada91abdf148f9f23cd73add717bb860a93a69..5c8a8369394707418ccff484bb6c38f8a5677b7d 100644 (file)
--- a/sdk/python/arvados/safeapi.py
+++ b/sdk/python/arvados/safeapi.py
@@ -1,8 +1,16 @@
-import threading
-import apisetup
-import keep
-import config
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+from __future__ import absolute_import
+
+from builtins import object
 import copy
+import threading
+
+import arvados
+import arvados.keep as keep
+import arvados.config as config
 
 class ThreadSafeApiCache(object):
     """Threadsafe wrapper for API objects.
@@ -21,7 +29,7 @@ class ThreadSafeApiCache(object):
 
     def localapi(self):
         if 'api' not in self.local.__dict__:
-            self.local.api = apisetup.api_from_config('v1', apiconfig=self.apiconfig)
+            self.local.api = arvados.api_from_config('v1', apiconfig=self.apiconfig)
         return self.local.api
 
     def __getattr__(self, name):