X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/44cc8137d0a0f71ddf0cea123c66ef4c34b50061..34173202861e94dee58ccd5b189983918813d870:/sdk/python/arvados/stream.py diff --git a/sdk/python/arvados/stream.py b/sdk/python/arvados/stream.py index cbd1ba91db..064a4f2e56 100644 --- a/sdk/python/arvados/stream.py +++ b/sdk/python/arvados/stream.py @@ -1,7 +1,6 @@ import gflags import httplib import httplib2 -import logging import os import pprint import sys @@ -137,7 +136,7 @@ class StreamFileReader(object): data = '' for locator, blocksize, segmentoffset, segmentsize in locators_and_ranges(self.segments, self._filepos, size): data += self._stream.readfrom(locator+segmentoffset, segmentsize) - self._filepos += len(data) + self._filepos += len(data) return data def readfrom(self, start, size): @@ -205,10 +204,9 @@ class StreamReader(object): self._data_locators = [] self._files = collections.OrderedDict() - if keep != None: - self._keep = keep - else: - self._keep = Keep.global_client_object() + if keep is None: + keep = KeepClient() + self._keep = keep streamoffset = 0L