Merge pull request #512 from common-workflow-language/rdf_python3_fix

cwltool/cwlrdf.py: Pass str rather than bytes to write function (Python 3 fix)

Author: mr-c

cwltool/cwlrdf.py

@@ -20,9 +20,9 @@ def visitor(t):
     return g
 
 
-def printrdf(wf, ctx, sr, stdout):
-    # type: (Process, ContextType, Text, IO[Any]) -> None
-    stdout.write(gather(wf, ctx).serialize(format=sr))
+def printrdf(wf, ctx, sr):
+    # type: (Process, ContextType, Text) -> Text
+    return gather(wf, ctx).serialize(format=sr).decode('utf-8')
 
 
 def lastpart(uri):  # type: (Any) -> Text

cwltool/main.py

@@ -839,7 +839,7 @@ def main(argsl=None,  # type: List[str]
                 return 0
 
             if args.print_rdf:
-                printrdf(tool, document_loader.ctx, args.rdf_serializer, stdout)
+                stdout.write(printrdf(tool, document_loader.ctx, args.rdf_serializer))
                 return 0
 
             if args.print_dot:

tests/test_rdfprint.py

@@ -0,0 +1,12 @@
+from __future__ import absolute_import
+import unittest
+
+from six import StringIO
+from cwltool.main import main
+
+from .util import get_data
+
+class RDF_Print(unittest.TestCase):
+
+    def test_rdf_print(self):
+        self.assertEquals(main(['--print-rdf', get_data('tests/wf/hello_single_tool.cwl')]), 0)