Merge branch '11807-yaml-to-json'

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

diff --git a/sdk/python/arvados/stream.py b/sdk/python/arvados/stream.py
index b68685e374d313d5337bbed80bbadd2e307ba7b5..edfb7711b829a100688f82bff203ebfec986096d 100644 (file)
--- a/sdk/python/arvados/stream.py
+++ b/sdk/python/arvados/stream.py
@@ -1,5 +1,10 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from __future__ import print_function
 from __future__ import absolute_import
+from future.utils import listvalues
 from builtins import object
 import collections
 import hashlib
@@ -63,7 +68,7 @@ class StreamReader(object):
         return self._files
 
     def all_files(self):
-        return list(self._files.values())
+        return listvalues(self._files)
 
     def size(self):
         n = self._data_locators[-1]
@@ -98,5 +103,5 @@ class StreamReader(object):
             manifest_text.extend([d.locator for d in self._data_locators])
         manifest_text.extend([' '.join(["{}:{}:{}".format(seg.locator, seg.range_size, f.name.replace(' ', '\\040'))
                                         for seg in f.segments])
-                              for f in list(self._files.values())])
+                              for f in listvalues(self._files)])
         return ' '.join(manifest_text) + '\n'