Merge pull request #494 from nschloe/redudant-semicolon

Redundant semicolon

Author: nschloe

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = tikzplotlib
-version = 0.9.8
+version = 0.9.9
 author = Nico Schlömer
 author_email = [email protected]
 description = Convert matplotlib figures into TikZ/PGFPlots

src/tikzplotlib/_line2d.py

@@ -93,7 +93,8 @@ def draw_line2d(data, obj):
     # process options
     content.append("\\addplot ")
     if addplot_options:
-        content.append("[{}]\n".format(", ".join(addplot_options)))
+        opts = ", ".join(addplot_options)
+        content.append(f"[{opts}]\n")
 
     c, axis_options = _table(obj, data)
     content += c
@@ -182,9 +183,8 @@ def _marker(
         data, draw_xcolor, _ = mycol.mpl_color2xcolor(data, marker_edge_color)
         if draw_xcolor != line_xcolor:
             mark_options.append("draw=" + draw_xcolor)
-    addplot_options.append("mark options={{{}}}".format(",".join(mark_options)))
-
-    return
+    opts = ",".join(mark_options)
+    addplot_options.append(f"mark options={{{opts}}}")
 
 
 def _table(obj, data):  # noqa: C901

src/tikzplotlib/_patch.py

@@ -55,9 +55,8 @@ def _patch_legend(obj, draw_options, legend_type):
     if _is_in_legend(obj):
         # Unfortunately, patch legend entries need \addlegendimage in Pgfplots.
         do = ", ".join([legend_type] + draw_options) if draw_options else ""
-        legend += "\\addlegendimage{{{}}}\n\\addlegendentry{{{}}}\n\n".format(
-            do, obj.get_label()
-        )
+        label = obj.get_label()
+        legend += f"\\addlegendimage{{{do}}}\n\\addlegendentry{{{label}}}\n\n"
 
     return legend
 
@@ -145,9 +144,8 @@ def _draw_rectangle(data, obj, draw_options):
 
     if label != "_nolegend_" and label not in data["rectangle_legends"]:
         data["rectangle_legends"].add(label)
-        cont += "\\addlegendimage{{ybar,ybar legend,{}}};\n".format(
-            ",".join(draw_options)
-        )
+        draw_opts = ",".join(draw_options)
+        cont += f"\\addlegendimage{{ybar,ybar legend,{draw_opts}}}\n"
         cont += f"\\addlegendentry{{{label}}}\n\n"
     return data, cont
 

src/tikzplotlib/_text.py

@@ -118,11 +118,9 @@ def draw_text(data, obj):
         # We might want to remove this here in the future.
         text = text.replace("\n ", "\\\\")
 
-    content.append(
-        "\\draw {pos} node[\n  {props}\n]{{{text}}};\n".format(
-            pos=tikz_pos, props=",\n  ".join(properties), text=" ".join(style + [text])
-        )
-    )
+    props = ",\n  ".join(properties)
+    text = " ".join(style + [text])
+    content.append(f"\\draw {tikz_pos} node[\n  {props}\n]{{{text}}};\n")
     return data, content
 
 
@@ -139,7 +137,8 @@ def _transform_positioning(ha, va):
         "center": "",
         "baseline": "base",
     }
-    return "anchor={} {}".format(va_mpl_to_tikz[va], ha_mpl_to_tikz[ha]).strip()
+    anchor = " ".join([va_mpl_to_tikz[va], ha_mpl_to_tikz[ha]]).strip()
+    return f"anchor={anchor}"
 
 
 def _parse_annotation_coords(ff, coords, xy):
@@ -229,7 +228,7 @@ def _annotation(obj, data, content):
 
     if obj.arrow_patch:
         style = ",".join(_get_arrow_style(obj.arrow_patch, data))
-        the_arrow = ("\\draw[{}] {} -- {};\n").format(style, text_pos, xy_pos)
+        the_arrow = f"\\draw[{style}] {text_pos} -- {xy_pos};\n"
         content.append(the_arrow)
     return text_pos
 
@@ -285,12 +284,11 @@ def _bbox(bbox, data, properties, scaling):
     # pattern from matplotlib instead of hardcoding
     # an approximation?
     elif bbox.get_ls() == "dashdot":
+        s1 = 1.0 / scaling
+        s3 = 3.0 / scaling
+        s6 = 6.0 / scaling
         properties.append(
-            "dash pattern=on {:.3g}pt off {:.3g}pt on {:.3g}pt off {:.3g}pt".format(
-                1.0 / scaling, 3.0 / scaling, 6.0 / scaling, 3.0 / scaling
-            )
+            f"dash pattern=on {s1:.3g}pt off {s3:.3g}pt on {s6:.3g}pt off {s3:.3g}pt"
         )
     else:
         assert bbox.get_ls() == "solid"
-
-    return

tests/test_barchart_legend_reference.tex

@@ -13,19 +13,19 @@
 ytick style={color=black}
 ]
 \draw[draw=none,fill=blue] (axis cs:-0.375,0) rectangle (axis cs:-0.125,1);
-\addlegendimage{ybar,ybar legend,draw=none,fill=blue};
+\addlegendimage{ybar,ybar legend,draw=none,fill=blue}
 \addlegendentry{Data 1}
 
 \draw[draw=none,fill=blue] (axis cs:0.625,0) rectangle (axis cs:0.875,2);
 \draw[draw=none,fill=blue] (axis cs:1.625,0) rectangle (axis cs:1.875,3);
 \draw[draw=none,fill=green!50!black] (axis cs:-0.125,0) rectangle (axis cs:0.125,3);
-\addlegendimage{ybar,ybar legend,draw=none,fill=green!50!black};
+\addlegendimage{ybar,ybar legend,draw=none,fill=green!50!black}
 \addlegendentry{Data 2}
 
 \draw[draw=none,fill=green!50!black] (axis cs:0.875,0) rectangle (axis cs:1.125,2);
 \draw[draw=none,fill=green!50!black] (axis cs:1.875,0) rectangle (axis cs:2.125,4);
 \draw[draw=none,fill=red] (axis cs:0.125,0) rectangle (axis cs:0.375,5);
-\addlegendimage{ybar,ybar legend,draw=none,fill=red};
+\addlegendimage{ybar,ybar legend,draw=none,fill=red}
 \addlegendentry{Data 3}
 
 \draw[draw=none,fill=red] (axis cs:1.125,0) rectangle (axis cs:1.375,3);

tests/test_histogram_reference.tex

@@ -16,7 +16,7 @@
 ytick style={color=black}
 ]
 \draw[draw=none,fill=color0] (axis cs:3.53789,0) rectangle (axis cs:4.8984168,7);
-\addlegendimage{ybar,ybar legend,draw=none,fill=color0};
+\addlegendimage{ybar,ybar legend,draw=none,fill=color0}
 \addlegendentry{men}
 
 \draw[draw=none,fill=color0] (axis cs:4.8984168,0) rectangle (axis cs:6.2589437,27);
@@ -29,7 +29,7 @@
 \draw[draw=none,fill=color0] (axis cs:14.422105,0) rectangle (axis cs:15.782632,7);
 \draw[draw=none,fill=color0] (axis cs:15.782632,0) rectangle (axis cs:17.143158,2);
 \draw[draw=none,fill=color1,fill opacity=0.5] (axis cs:0.59586541,0) rectangle (axis cs:2.5914912,2);
-\addlegendimage{ybar,ybar legend,draw=none,fill=color1,fill opacity=0.5};
+\addlegendimage{ybar,ybar legend,draw=none,fill=color1,fill opacity=0.5}
 \addlegendentry{women}
 
 \draw[draw=none,fill=color1,fill opacity=0.5] (axis cs:2.5914912,0) rectangle (axis cs:4.587117,6);