From 7e1c8ea79a19d5f756f8549474547da52137ce6d Mon Sep 17 00:00:00 2001 From: Eric Biagiotti Date: Thu, 31 Jan 2019 12:16:42 -0500 Subject: [PATCH] 13306: Fixes futurize mistakes regarding PathMapper items() Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti --- sdk/cwl/arvados_cwl/arvcontainer.py | 2 +- sdk/cwl/arvados_cwl/arvjob.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py index a45321d378..e921b26dfe 100644 --- a/sdk/cwl/arvados_cwl/arvcontainer.py +++ b/sdk/cwl/arvados_cwl/arvcontainer.py @@ -140,7 +140,7 @@ class ArvadosContainer(JobBase): generatemapper = NoFollowPathMapper(self.generatefiles["listing"], "", "", separateDirs=False) - sorteditems = sorted(list(generatemapper.items()), key=lambda n: n[1].target) + sorteditems = sorted(generatemapper.items(), key=lambda n: n[1].target) logger.debug("generatemapper is %s", sorteditems) diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py index bdf798d300..69fe7e2a8f 100644 --- a/sdk/cwl/arvados_cwl/arvjob.py +++ b/sdk/cwl/arvados_cwl/arvjob.py @@ -75,7 +75,7 @@ class ArvadosJob(JobBase): separateDirs=False) with Perf(metrics, "createfiles %s" % self.name): - for f, p in list(generatemapper.items()): + for f, p in generatemapper.items(): if p.type == "CreateFile": with vwd.open(p.target, "w") as n: n.write(p.resolved.encode("utf-8")) @@ -89,7 +89,7 @@ class ArvadosJob(JobBase): trash_at=info["trash_at"], properties=info["properties"]) - for f, p in list(generatemapper.items()): + for f, p in generatemapper.items(): if p.type == "File": script_parameters["task.vwd"][p.target] = p.resolved if p.type == "CreateFile": -- 2.30.2