Merge branch '21535-multi-wf-delete'

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

diff --git a/sdk/python/arvados/stream.py b/sdk/python/arvados/stream.py
index eadfbbec07d9f785ad289ea6928080ff41907eca..ff541e5716c8598ea36ad13e5d61132643a77461 100644 (file)
--- a/sdk/python/arvados/stream.py
+++ b/sdk/python/arvados/stream.py
@@ -2,10 +2,6 @@
 #
 # 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
 import os
@@ -20,9 +16,11 @@ from arvados.retry import retry_method
 from arvados.keep import *
 from . import config
 from . import errors
+from . import util
 from ._normalize_stream import normalize_stream
 
 class StreamReader(object):
+    @util._deprecated('3.0', 'arvados.collection.Collecttion')
     def __init__(self, tokens, keep=None, debug=False, _empty=False,
                  num_retries=10):
         self._stream_name = None
@@ -68,7 +66,7 @@ class StreamReader(object):
         return self._files
 
     def all_files(self):
-        return listvalues(self._files)
+        return list(self._files.values())
 
     def size(self):
         n = self._data_locators[-1]
@@ -103,5 +101,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 listvalues(self._files)])
+                              for f in self._files.values()])
         return ' '.join(manifest_text) + '\n'