Consolidate string formatting and conversion (#1402)

Author: eumiro

rustworkx/__init__.py

@@ -731,7 +731,7 @@ def to_marker_edge(marker_size, marker):
             mutation_scale=mutation_scale,
             color=arrow_color,
             linewidth=line_width,
-            connectionstyle=connectionstyle + f", rad = {rad}",
+            connectionstyle=f"{connectionstyle}, rad = {rad}",
             linestyle=style,
             zorder=1,
         )  # arrows go behind nodes

rustworkx/visualization/matplotlib.py

@@ -126,7 +126,7 @@ def test_file_output(self):
             self.assertEqual(json_dict, expected)
 
     def test_invalid_path_dir(self):
-        nonexistent_path = tempfile.gettempdir() + "/" + str(uuid.uuid4()) + "/graph.rustworkx.json"
+        nonexistent_path = f"{tempfile.gettempdir()}/{uuid.uuid4()}/graph.rustworkx.json"
         graph = rustworkx.PyDiGraph()
         with self.assertRaises(FileNotFoundError):
             rustworkx.node_link_json(graph, path=nonexistent_path)

tests/digraph/test_node_link_json.py

@@ -412,7 +412,7 @@ def test_lexicographical_topo_sort(self):
         for i in range(5):
             dag.add_child(node_a, i, None)
         dag.add_parent(3, "A parent", None)
-        res = rustworkx.lexicographical_topological_sort(dag, lambda x: str(x))
+        res = rustworkx.lexicographical_topological_sort(dag, str)
         # Node values for nodes [6, 0, 5, 4, 3, 2, 1]
         expected = ["A parent", "a", 0, 1, 2, 3, 4]
         self.assertEqual(expected, res)
@@ -588,7 +588,7 @@ def test_lexicographical_topo_sort_qiskit(self):
         cr_1_out = dag.add_node("cr[1]_out")
         dag.add_edge(cr_1, cr_1_out, "cr[1]")
 
-        res = list(rustworkx.lexicographical_topological_sort(dag, lambda x: str(x)))
+        res = list(rustworkx.lexicographical_topological_sort(dag, str))
         expected = [
             "cr[0]",
             "cr[0]_out",

tests/digraph/test_nodes.py

@@ -55,7 +55,7 @@ def test_edge_weight_modifier(self):
             2,
             in_graph,
             lambda _, __, ___: 0,
-            edge_weight_map=lambda edge: edge + "-migrated",
+            edge_weight_map=lambda edge: f"{edge}-migrated",
         )
         self.assertEqual([(0, 1), (3, 4), (5, 6), (1, 5), (5, 3)], self.graph.edge_list())
         self.assertEqual("edge-migrated", self.graph.get_edge_data(5, 6))

tests/digraph/test_substitute_node_with_subgraph.py

@@ -126,7 +126,7 @@ def test_file_output(self):
             self.assertEqual(json_dict, expected)
 
     def test_invalid_path_dir(self):
-        nonexistent_path = tempfile.gettempdir() + "/" + str(uuid.uuid4()) + "/graph.rustworkx.json"
+        nonexistent_path = f"{tempfile.gettempdir()}/{uuid.uuid4()}/graph.rustworkx.json"
         graph = rustworkx.PyGraph()
         with self.assertRaises(FileNotFoundError):
             rustworkx.node_link_json(graph, path=nonexistent_path)

tests/graph/test_node_link_json.py

@@ -74,7 +74,7 @@ def test_edge_weight_modifier(self):
             2,
             in_graph,
             lambda _, __, ___: 0,
-            edge_weight_map=lambda edge: edge + "-migrated",
+            edge_weight_map=lambda edge: f"{edge}-migrated",
         )
         self.assertEqual([(0, 1), (3, 4), (5, 6), (1, 5), (5, 3)], self.graph.edge_list())
         self.assertEqual("edge-migrated", self.graph.get_edge_data(5, 6))

tests/graph/test_substitute_node_with_subgraph.py

@@ -106,7 +106,7 @@ def test_gzipped(self):
         ## Test reading a graphmlz
         with tempfile.NamedTemporaryFile("w+b") as fd:
             fd.flush()
-            newname = fd.name + ".gz"
+            newname = f"{fd.name}.gz"
             with gzip.open(newname, "wt") as wf:
                 wf.write(graph_xml)
 
@@ -130,7 +130,7 @@ def test_gzipped_force(self):
         with tempfile.NamedTemporaryFile("w+b") as fd:
             # close the file
             fd.flush()
-            newname = fd.name + ".ext"
+            newname = f"{fd.name}.ext"
             with gzip.open(newname, "wt") as wf:
                 wf.write(graph_xml)
 

tests/test_graphml.py

@@ -44,7 +44,7 @@ def _main():
     failed_files = [x for x in res if x is not None]
     if len(failed_files) > 0:
         for failed_file in failed_files:
-            sys.stderr.write("%s is not in the correct location.\n" % failed_file)
+            sys.stderr.write(f"{failed_file} is not in the correct location.\n")
         sys.exit(1)
     sys.exit(0)