11789: Merge branch 'master' into 11789-arvput-exclude-flag

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

diff --git a/sdk/python/arvados/__init__.py b/sdk/python/arvados/__init__.py
index c018d566cb00108af958894533ceaba4987f166f..06a4f07a798e274094160dc9ce836ca6507b4b4d 100644 (file)
--- a/sdk/python/arvados/__init__.py
+++ b/sdk/python/arvados/__init__.py
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from __future__ import print_function
 from __future__ import absolute_import
 from future import standard_library
@@ -5,7 +9,6 @@ standard_library.install_aliases()
 from builtins import object
 import bz2
 import fcntl
-import gflags
 import hashlib
 import http.client
 import httplib2
@@ -29,12 +32,12 @@ else:
 
 from .api import api, api_from_config, http_cache
 from .collection import CollectionReader, CollectionWriter, ResumableCollectionWriter
-from .keep import *
-from .stream import *
+from arvados.keep import *
+from arvados.stream import *
 from .arvfile import StreamFileReader
 from .retry import RetryLoop
-from . import errors
-from . import util
+import arvados.errors as errors
+import arvados.util as util
 
 # Set up Arvados logging based on the user's configuration.
 # All Arvados code should log under the arvados hierarchy.