13306: Updating dict values as a list to improve py2 performance

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 313c3925a466656e065bdb1d3623c222549fcd96..eeef4bce39c38feae6ace2a7eca6b51831532db6 100644 (file)
--- a/sdk/cwl/arvados_cwl/done.py
+++ b/sdk/cwl/arvados_cwl/done.py
@@ -2,6 +2,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from future.utils import listvalues
+
 import re
 from cwltool.errors import WorkflowException
 from collections import deque
@@ -91,7 +93,7 @@ def logtail(logcollection, logfunc, header, maxlen=25):
             loglines.append("%s %s %s" % (ts, earliest, msg))
         loglines = loglines[-maxlen:]
     else:
-        loglines = list(mergelogs.values())[0]
+        loglines = listvalues(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 3baa7835f50a9cfc4e1a110070cdcb4cd9923f63..383a816bbb3e2f99b93fc4f4dfbb580ed0037458 100644 (file)
--- a/sdk/cwl/arvados_cwl/fsaccess.py
+++ b/sdk/cwl/arvados_cwl/fsaccess.py
@@ -5,6 +5,7 @@
 from future import standard_library
 standard_library.install_aliases()
 from builtins import object
+from future.utils import listvalues
 
 import fnmatch
 import os
@@ -294,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:" + list(pt["components"].values())[0]["script_parameters"]["cwl:tool"]
+        return "keep:" + listvalues(pt["components"])[0]["script_parameters"]["cwl:tool"]
 
     p = uri.split("/")
     if arvados.util.keep_locator_pattern.match(p[0]):