[ARVADOS] updated: e30f2cc5c876a3efc62f619654971f8200210576

git at public.curoverse.com git at public.curoverse.com
Tue Jan 21 16:57:29 EST 2014


Summary of changes:
 sdk/python/arvados/__init__.py   |    7 ++++---
 sdk/python/arvados/collection.py |    1 +
 sdk/python/arvados/keep.py       |    2 ++
 sdk/python/arvados/stream.py     |    2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

       via  e30f2cc5c876a3efc62f619654971f8200210576 (commit)
      from  18e4d66b6fc65bc7dc486b3ff144cce92af5df8c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e30f2cc5c876a3efc62f619654971f8200210576
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Jan 21 16:57:53 2014 -0500

    Fixed import problems due to splitting module into multiple files

diff --git a/sdk/python/arvados/__init__.py b/sdk/python/arvados/__init__.py
index 484d9ed..b881066 100644
--- a/sdk/python/arvados/__init__.py
+++ b/sdk/python/arvados/__init__.py
@@ -21,13 +21,14 @@ import threading
 import apiclient
 import apiclient.discovery
 
+config = None
+EMPTY_BLOCK_LOCATOR = 'd41d8cd98f00b204e9800998ecf8427e+0'
+services = {}
+
 from stream import *
 from collection import *
 from keep import *
 
-config = None
-EMPTY_BLOCK_LOCATOR = 'd41d8cd98f00b204e9800998ecf8427e+0'
-services = {}
 
 # Arvados configuration settings are taken from $HOME/.config/arvados.
 # Environment variables override settings in the config file.
diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py
index 9a680d4..dc2f0f8 100644
--- a/sdk/python/arvados/collection.py
+++ b/sdk/python/arvados/collection.py
@@ -19,6 +19,7 @@ import time
 import threading
 
 from stream import *
+from keep import *
 
 class CollectionReader(object):
     def __init__(self, manifest_locator_or_text):
diff --git a/sdk/python/arvados/keep.py b/sdk/python/arvados/keep.py
index 055da62..62e9d08 100644
--- a/sdk/python/arvados/keep.py
+++ b/sdk/python/arvados/keep.py
@@ -20,6 +20,8 @@ import threading
 
 global_client_object = None
 
+from arvados import *
+
 class Keep:
     @staticmethod
     def global_client_object():
diff --git a/sdk/python/arvados/stream.py b/sdk/python/arvados/stream.py
index 5dd8a89..8570b97 100644
--- a/sdk/python/arvados/stream.py
+++ b/sdk/python/arvados/stream.py
@@ -18,6 +18,8 @@ import fcntl
 import time
 import threading
 
+from keep import *
+
 class StreamFileReader(object):
     def __init__(self, stream, pos, size, name):
         self._stream = stream

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list