X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/904e7f972f9d37031fe6e1c24a2e0233c63d38e2..8d9ccb409bd1a301eea9cbb3a3911797ff7c286a:/sdk/python/arvados/stream.py

diff --git a/sdk/python/arvados/stream.py b/sdk/python/arvados/stream.py
index ca5a9e5e54..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
 
@@ -269,7 +267,7 @@ class StreamReader(object):
         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])