X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e7b601c25f6ac88e7adaf219f296c448d29c3904..878620a8b1827ed3f58e267a89f76c2dbeaa4b65:/sdk/python/arvados/collection.py diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py index ff29919f1b..f7364758a5 100644 --- a/sdk/python/arvados/collection.py +++ b/sdk/python/arvados/collection.py @@ -22,6 +22,7 @@ from keep import * from stream import * import config import errors +import util def normalize_stream(s, stream): stream_tokens = [s] @@ -55,9 +56,9 @@ def normalize_stream(s, stream): stream_tokens.append("{0}:{1}:{2}".format(current_span[0], current_span[1] - current_span[0], fout)) if len(stream[f]) == 0: - stream_tokens.append("0:0:{0}".format(fout)) + stream_tokens.append("0:0:{0}".format(fout)) - return stream_tokens + return stream_tokens def normalize(collection): streams = {} @@ -284,7 +285,7 @@ class CollectionWriter(object): manifest += ' ' + ' '.join(stream[1]) manifest += ' ' + ' '.join("%d:%d:%s" % (sfile[0], sfile[1], sfile[2].replace(' ', '\\040')) for sfile in stream[2]) manifest += "\n" - + #print 'writer',manifest #print 'after reader',CollectionReader(manifest).manifest_text()