4389: Merge branch 'master' into 4389-breadcrumbs-infinite-loop

[arvados.git] / sdk / python / arvados / stream.py

diff --git a/sdk/python/arvados/stream.py b/sdk/python/arvados/stream.py
index 0e153f58e27d6e357b7f7de0c904dd0c0e41a90b..f5975b9a773eb5d518d8ff12614fb3a6c55d8b84 100644 (file)
--- a/sdk/python/arvados/stream.py
+++ b/sdk/python/arvados/stream.py
@@ -208,7 +208,7 @@ class StreamFileReader(object):
         manifest_text = ['.']
         manifest_text.extend([d[LOCATOR] for d in self._stream._data_locators])
         manifest_text.extend(["{}:{}:{}".format(seg[LOCATOR], seg[BLOCKSIZE], self.name().replace(' ', '\\040')) for seg in self.segments])
-        return arvados.CollectionReader(' '.join(manifest_text) + '\n').normalize().manifest_text()
+        return arvados.CollectionReader(' '.join(manifest_text) + '\n').manifest_text(normalize=True)
 
 
 class StreamReader(object):
@@ -225,7 +225,7 @@ class StreamReader(object):
         # parse stream
         for tok in tokens:
             if debug: print 'tok', tok
-            if self._stream_name == None:
+            if self._stream_name is None:
                 self._stream_name = tok.replace('\\040', ' ')
                 continue