import gflags
import httplib
import httplib2
-import logging
import os
import pprint
import sys
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):
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
manifest_text = [self.name().replace(' ', '\\040')]
if strip:
for d in self._data_locators:
- m = re.match(r'^[0-9a-f]{32}\+(\d+)*', d[LOCATOR])
+ m = re.match(r'^[0-9a-f]{32}\+\d+', d[LOCATOR])
manifest_text.append(m.group(0))
else:
manifest_text.extend([d[LOCATOR] for d in self._data_locators])