Fix pydot tests

Author: lkk7

cwltool/cwlviewer.py

@@ -89,8 +89,8 @@ def _set_inner_edges(self) -> None:
             self._dot_graph.add_node(n)
             self._dot_graph.add_edge(
                 pydot.Edge(
-                    str(inner_edge_row["source_step"]),
-                    str(inner_edge_row["target_step"]),
+                    pydot.quote_id_if_necessary(str(inner_edge_row["source_step"])),
+                    pydot.quote_id_if_necessary(str(inner_edge_row["target_step"])),
                 )
             )
 
@@ -100,7 +100,6 @@ def _set_input_edges(self) -> None:
         inputs_subgraph = pydot.Subgraph(graph_name="cluster_inputs")
         self._dot_graph.add_subgraph(inputs_subgraph)
         inputs_subgraph.set("rank", "same")
-        inputs_subgraph.create_attribute_methods(["style"])
         inputs_subgraph.set("style", "dashed")
         inputs_subgraph.set("label", "Workflow Inputs")
 
@@ -120,15 +119,19 @@ def _set_input_edges(self) -> None:
             )
             n.set_name(str(input_row["input"]))
             inputs_subgraph.add_node(n)
-            self._dot_graph.add_edge(pydot.Edge(str(input_row["input"]), str(input_row["step"])))
+            self._dot_graph.add_edge(
+                pydot.Edge(
+                    pydot.quote_id_if_necessary(str(input_row["input"])),
+                    pydot.quote_id_if_necessary(str(input_row["step"])),
+                )
+            )
 
     def _set_output_edges(self) -> None:
         with open(_get_output_edges_query_path) as f:
             get_output_edges = f.read()
         outputs_graph = pydot.Subgraph(graph_name="cluster_outputs")
         self._dot_graph.add_subgraph(outputs_graph)
         outputs_graph.set("rank", "same")
-        outputs_graph.create_attribute_methods(["style"])
         outputs_graph.set("style", "dashed")
         outputs_graph.set("label", "Workflow Outputs")
         outputs_graph.set("labelloc", "b")
@@ -148,7 +151,12 @@ def _set_output_edges(self) -> None:
             )
             n.set_name(str(output_edge_row["output"]))
             outputs_graph.add_node(n)
-            self._dot_graph.add_edge(pydot.Edge(output_edge_row["step"], output_edge_row["output"]))
+            self._dot_graph.add_edge(
+                pydot.Edge(
+                    pydot.quote_id_if_necessary(output_edge_row["step"]),
+                    pydot.quote_id_if_necessary(output_edge_row["output"]),
+                )
+            )
 
     def _get_root_graph_uri(self) -> rdflib.term.Identifier:
         with open(_get_root_query_path) as f:

mypy-stubs/pydot.pyi

@@ -21,7 +21,6 @@ class Common:
     def get_attributes(self) -> Dict[str, str]: ...
     def set_sequence(self, seq: str) -> None: ...
     def get_sequence(self) -> str: ...
-    def create_attribute_methods(self, obj_attributes: List[str]) -> None: ...
 
 class Error(Exception):
     value: Any