projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '5562-pycurl' closes #5562
[arvados.git]
/
sdk
/
python
/
arvados
/
stream.py
diff --git
a/sdk/python/arvados/stream.py
b/sdk/python/arvados/stream.py
index a6e086366c8ac8611dbc7271ad55cfa80d0f55f0..3a42aa010112a7e52d36319ff15558d7ff6298f0 100644
(file)
--- a/
sdk/python/arvados/stream.py
+++ b/
sdk/python/arvados/stream.py
@@
-6,7
+6,7
@@
import threading
import functools
import copy
import functools
import copy
-from ._ranges import locators_and_ranges
+from ._ranges import locators_and_ranges
, Range
from .arvfile import StreamFileReader
from arvados.retry import retry_method
from keep import *
from .arvfile import StreamFileReader
from arvados.retry import retry_method
from keep import *
@@
-62,13
+62,10
@@
class StreamReader(object):
def all_files(self):
return self._files.values()
def all_files(self):
return self._files.values()
- def
_
size(self):
+ def size(self):
n = self._data_locators[-1]
return n.range_start + n.range_size
n = self._data_locators[-1]
return n.range_start + n.range_size
- def size(self):
- return self._size()
-
def locators_and_ranges(self, range_start, range_size):
return locators_and_ranges(self._data_locators, range_start, range_size)
def locators_and_ranges(self, range_start, range_size):
return locators_and_ranges(self._data_locators, range_start, range_size)
@@
-78,10
+75,6
@@
class StreamReader(object):
@retry_method
def readfrom(self, start, size, num_retries=None):
@retry_method
def readfrom(self, start, size, num_retries=None):
- return self._readfrom(start, size, num_retries=num_retries)
-
- @retry_method
- def _readfrom(self, start, size, num_retries=None):
"""Read up to 'size' bytes from the stream, starting at 'start'"""
if size == 0:
return ''
"""Read up to 'size' bytes from the stream, starting at 'start'"""
if size == 0:
return ''