10165: DRY key cleanup.

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 21d30191692814b62005fe9804ff2de92d389541..ef4f78552989764a8a1e02234939021c1f44415c 100644 (file)
--- a/sdk/cwl/arvados_cwl/__init__.py
+++ b/sdk/cwl/arvados_cwl/__init__.py
@@ -194,12 +194,9 @@ class ArvCwlRunner(object):
 
         def rewrite(fileobj):
             fileobj["location"] = generatemapper.mapper(fileobj["location"]).target
-            if "basename" in fileobj:
-                del fileobj["basename"]
-            if "size" in fileobj:
-                del fileobj["size"]
-            if "listing" in fileobj:
-                del fileobj["listing"]
+            for k in ("basename", "size", "listing"):
+                if k in fileobj:
+                    del fileobj[k]
 
         adjustDirObjs(outputObj, rewrite)
         adjustFileObjs(outputObj, rewrite)