Per previous commit

Author: illusional

cwlgen/commandlinetool.py

@@ -37,11 +37,11 @@ def __init__(self, glob=None, load_contents=None, output_eval=None):
 
 
 class CommandInputParameter(Parameter):
-    '''
+    """
     An input parameter for a :class:`cwlgen.CommandLineTool`.
-    '''
+    """
 
-    parse_types = [("inputBinding", [CommandLineBinding])]
+    parse_types = {"inputBinding": [CommandLineBinding]}
 
     def __init__(self, param_id, label=None, secondary_files=None, param_format=None,
                  streamable=None, doc=None, input_binding=None, default=None, param_type=None):
@@ -79,7 +79,7 @@ class CommandOutputParameter(Parameter):
     An output parameter for a :class:`cwlgen.CommandLineTool`.
     '''
 
-    parse_types = [("outputBinding", [CommandOutputBinding])]
+    parse_types = {"outputBinding": [CommandOutputBinding]}
 
     def __init__(self, param_id, label=None, secondary_files=None, param_format=None,
                  streamable=None, doc=None, output_binding=None, param_type=None):
@@ -115,29 +115,29 @@ class CommandLineTool(Serializable):
 
     __CLASS__ = 'CommandLineTool'
 
-    parse_types = [('inputs', [[CommandInputParameter]]), ("outputs", [[CommandOutputParameter]])]
+    parse_types = {'inputs': [[CommandInputParameter]], "outputs": [[CommandOutputParameter]]}
     ignore_fields_on_parse = ["namespaces", "class"]
     ignore_fields_on_convert = ["namespaces", "class", "metadata", "requirements"]
 
     def __init__(self, tool_id=None, base_command=None, label=None, doc=None,
                  cwl_version=None, stdin=None, stderr=None, stdout=None, path=None):
         '''
         :param tool_id: unique identifier for this tool
-        :type tool_id: STRING
+        :type tool_id: str
         :param base_command: command line for the tool
-        :type base_command: STRING | list[STRING]
+        :type base_command: str | list[STRING]
         :param label: label of this tool
-        :type label: STRING
+        :type label: str
         :param doc: documentation for the tool, usually longer than the label
-        :type doc: STRING
+        :type doc: str
         :param cwl_version: version of the CWL tool
-        :type cwl_version: STRING
+        :type cwl_version: str
         :param stdin: path to a file whose contents must be piped into stdin
-        :type stdin: STRING
+        :type stdin: str
         :param stderr: capture stderr into the given file
-        :type stderr: STRING
+        :type stderr: str
         :param stdout: capture stdout into the given file
-        :type stdout: STRING
+        :type stdout: str
 
         inputs (:class:`cwlgen.CommandInputParameter` objects),
         outputs (:class:`cwlgen.CommandOutputParameter` objects),

cwlgen/workflow.py

@@ -38,11 +38,11 @@ class Workflow(Serializable):
     __CLASS__ = 'Workflow'
     ignore_fields_on_parse = ["class"]
     ignore_fields_on_convert = ["inputs", "outputs"]
-    parse_types = [
-        ("inputs", [[InputParameter]]),
-        ("outputs", [[WorkflowOutputParameter]]),
-        ("steps", [[WorkflowStep]])
-    ]
+    parse_types = {
+        "inputs": [[InputParameter]],
+        "outputs": [[WorkflowOutputParameter]],
+        "steps": [[WorkflowStep]],
+    }
 
     def __init__(self, workflow_id=None, label=None, doc=None, cwl_version='v1.0'):
         """