13306: Improved py2/3 str compatibility

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <eric.biagiotti@gmail.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index eab12efaac6e34f08cc7ffc2869ebe344a7ae44b..535cfd7582b985ad806d659f518f9da9ce0e6fbc 100644 (file)
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -5,6 +5,7 @@
 from __future__ import division
 from builtins import next
 from builtins import object
+from builtins import str
 from future.utils import viewvalues
 
 import argparse
@@ -467,7 +468,7 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
         adjustFileObjs(outputObj, rewrite)
 
         with final.open("cwl.output.json", "w") as f:
-            res = json.dumps(outputObj, sort_keys=True, indent=4, separators=(',',': '), ensure_ascii=False).encode('utf-8').decode()
+            res = str(json.dumps(outputObj, sort_keys=True, indent=4, separators=(',',': '), ensure_ascii=False))
             f.write(res)           
 
         final.save_new(name=name, owner_uuid=self.project_uuid, storage_classes=storage_classes, ensure_unique_name=True)

diff --git a/sdk/cwl/arvados_cwl/fsaccess.py b/sdk/cwl/arvados_cwl/fsaccess.py
index fc0bbb80b9ea05715770c2d3142e7208ca19dcb2..fc7cc42d15c61f19021f006cb1eec18ab94178cd 100644 (file)
--- a/sdk/cwl/arvados_cwl/fsaccess.py
+++ b/sdk/cwl/arvados_cwl/fsaccess.py
@@ -5,6 +5,7 @@
 from future import standard_library
 standard_library.install_aliases()
 from builtins import object
+from builtins import str
 from future.utils import viewvalues
 
 import fnmatch
@@ -288,7 +289,7 @@ pipeline_template_uuid_pattern = re.compile(r'[a-z0-9]{5}-p5p6p-[a-z0-9]{15}')
 
 def collectionResolver(api_client, document_loader, uri, num_retries=4):
     if uri.startswith("keep:") or uri.startswith("arvwf:"):
-        return uri.encode("utf-8").decode()
+        return str(uri)
 
     if workflow_uuid_pattern.match(uri):
         return u"arvwf:%s#main" % (uri)