projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 6260-test-datamanager
[arvados.git]
/
sdk
/
python
/
arvados
/
stream.py
diff --git
a/sdk/python/arvados/stream.py
b/sdk/python/arvados/stream.py
index 3a42aa010112a7e52d36319ff15558d7ff6298f0..afc202e1806cd9c5ce32ce4aa8e09777d527be0b 100644
(file)
--- a/
sdk/python/arvados/stream.py
+++ b/
sdk/python/arvados/stream.py
@@
-35,7
+35,7
@@
class StreamReader(object):
s = re.match(r'^[0-9a-f]{32}\+(\d+)(\+\S+)*$', tok)
if s:
blocksize = long(s.group(1))
s = re.match(r'^[0-9a-f]{32}\+(\d+)(\+\S+)*$', tok)
if s:
blocksize = long(s.group(1))
- self._data_locators.append(Range(tok, streamoffset, blocksize))
+ self._data_locators.append(Range(tok, streamoffset, blocksize
, 0
))
streamoffset += blocksize
continue
streamoffset += blocksize
continue
@@
-45,7
+45,7
@@
class StreamReader(object):
size = long(s.group(2))
name = s.group(3).replace('\\040', ' ')
if name not in self._files:
size = long(s.group(2))
name = s.group(3).replace('\\040', ' ')
if name not in self._files:
- self._files[name] = StreamFileReader(self, [Range(pos, 0, size)], name)
+ self._files[name] = StreamFileReader(self, [Range(pos, 0, size
, 0
)], name)
else:
filereader = self._files[name]
filereader.segments.append(Range(pos, filereader.size(), size))
else:
filereader = self._files[name]
filereader.segments.append(Range(pos, filereader.size(), size))