13306: Fixing previous commit to use viewvalues instead of listvalues

Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/done.py b/sdk/cwl/arvados_cwl/done.py
index eeef4bce39c38feae6ace2a7eca6b51831532db6..378192b620ce5d390068782fa94f0bd48f8b1ea8 100644 (file)
--- a/sdk/cwl/arvados_cwl/done.py
+++ b/sdk/cwl/arvados_cwl/done.py
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-from future.utils import listvalues
+from future.utils import viewvalues
 
 import re
 from cwltool.errors import WorkflowException
@@ -93,7 +93,7 @@ def logtail(logcollection, logfunc, header, maxlen=25):
             loglines.append("%s %s %s" % (ts, earliest, msg))
         loglines = loglines[-maxlen:]
     else:
-        loglines = listvalues(mergelogs)[0]
+        loglines = viewvalues(mergelogs)[0]
 
     logtxt = "\n  ".join(l.strip() for l in loglines)
     logfunc("%s\n\n  %s", header, logtxt)

diff --git a/sdk/cwl/arvados_cwl/fsaccess.py b/sdk/cwl/arvados_cwl/fsaccess.py
index 383a816bbb3e2f99b93fc4f4dfbb580ed0037458..dbcc66245d41ed2ece2b43637ffb2c365eb2433a 100644 (file)
--- a/sdk/cwl/arvados_cwl/fsaccess.py
+++ b/sdk/cwl/arvados_cwl/fsaccess.py
@@ -5,7 +5,7 @@
 from future import standard_library
 standard_library.install_aliases()
 from builtins import object
-from future.utils import listvalues
+from future.utils import viewvalues
 
 import fnmatch
 import os
@@ -295,7 +295,7 @@ def collectionResolver(api_client, document_loader, uri, num_retries=4):
 
     if pipeline_template_uuid_pattern.match(uri):
         pt = api_client.pipeline_templates().get(uuid=uri).execute(num_retries=num_retries)
-        return "keep:" + listvalues(pt["components"])[0]["script_parameters"]["cwl:tool"]
+        return "keep:" + viewvalues(pt["components"])[0]["script_parameters"]["cwl:tool"]
 
     p = uri.split("/")
     if arvados.util.keep_locator_pattern.match(p[0]):