[ARVADOS] updated: 83139cd2df6b7d86f352bee46d1ad86146bd093b

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

       via  83139cd2df6b7d86f352bee46d1ad86146bd093b (commit)
      from  f72b0e8bcc350966ce54954711bed538c527eb00 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 83139cd2df6b7d86f352bee46d1ad86146bd093b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Sep 30 17:00:34 2016 -0400

    10165: DRY key cleanup.

diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py
index 21d3019..ef4f785 100644
--- 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)

-----------------------------------------------------------------------


hooks/post-receive
--