13306: Changes to arvados-cwl-runner code after running futurize --stage1

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index 27774b2f7cf6bd1fbb9bd8474f5dde4e7e4d6d51..31ac4c2478dccc5dcf60775c8f1e28db5ec4632d 100644 (file)
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -660,7 +660,7 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
                            runtimeContext)
 
         if runtimeContext.submit and not runtimeContext.wait:
-            runnerjob = jobiter.next()
+            runnerjob = next(jobiter)
             runnerjob.run(runtimeContext)
             return (runnerjob.uuid, "success")
 

diff --git a/sdk/cwl/tests/federation/framework/check_exist.py b/sdk/cwl/tests/federation/framework/check_exist.py
index b3338939edd983850ec7d426fa32619176cc4d84..1458772a3f65f22dfe494df7ddbe55d7ca308f2e 100644 (file)
--- a/sdk/cwl/tests/federation/framework/check_exist.py
+++ b/sdk/cwl/tests/federation/framework/check_exist.py
@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import print_function
 import arvados
 import json
 

diff --git a/sdk/cwl/tests/federation/framework/prepare.py b/sdk/cwl/tests/federation/framework/prepare.py
index 6fe90813e7a720c9ba5c11d9650af34e49ee9cdd..40bb843b2980877a0dbe10f18b41463c255609e5 100644 (file)
--- a/sdk/cwl/tests/federation/framework/prepare.py
+++ b/sdk/cwl/tests/federation/framework/prepare.py
@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import print_function
 import arvados
 import json
 

diff --git a/sdk/cwl/tests/hw.py b/sdk/cwl/tests/hw.py
index 99c26523ed471dc6d14b165aee9cceba5d9e57b5..e45bd72642df7e735bdc0d5529286536bf536de8 100644 (file)
--- a/sdk/cwl/tests/hw.py
+++ b/sdk/cwl/tests/hw.py
@@ -2,4 +2,5 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-print "Hello world"
+from __future__ import print_function
+print("Hello world")

diff --git a/sdk/cwl/tests/wf/check_mem.py b/sdk/cwl/tests/wf/check_mem.py
index 355872232bc7f430a8b61f7e8f8dffbe09cc5530..bad16ed06bcfd0c4661309834f3e26ec80cb3084 100644 (file)
--- a/sdk/cwl/tests/wf/check_mem.py
+++ b/sdk/cwl/tests/wf/check_mem.py
@@ -2,6 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+from __future__ import print_function
 import arvados
 import sys
 import os