X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/51c1daf863f3e1920f758f73b4e5d70ff2c706d6..2c3a6a67bc01241f57e815f4f7e4678bd6eadb03:/sdk/cwl/arvados_cwl/arvjob.py diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py index 87d6d1049a..69fe7e2a8f 100644 --- a/sdk/cwl/arvados_cwl/arvjob.py +++ b/sdk/cwl/arvados_cwl/arvjob.py @@ -2,6 +2,10 @@ # # SPDX-License-Identifier: Apache-2.0 +from past.builtins import basestring +from builtins import object +from future.utils import viewitems + import logging import re import copy @@ -243,7 +247,7 @@ class ArvadosJob(JobBase): api_client=self.arvrunner.api, keep_client=self.arvrunner.keep_client, num_retries=self.arvrunner.num_retries) - log = logc.open(logc.keys()[0]) + log = logc.open(list(logc.keys())[0]) dirs = { "tmpdir": "/tmpdir", "outdir": "/outdir", @@ -343,7 +347,7 @@ class RunnerJob(Runner): find_or_create=self.enable_reuse ).execute(num_retries=self.arvrunner.num_retries) - for k,v in job_spec["script_parameters"].items(): + for k,v in viewitems(job_spec["script_parameters"]): if v is False or v is None or isinstance(v, dict): job_spec["script_parameters"][k] = {"value": v}