use f-strings, require python 3.6

Author: nschloe

setup.py

@@ -21,7 +21,7 @@
     long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
     license=about["__license__"],
-    python_requires=">=3",
+    python_requires=">=3.6",
     classifiers=[
         about["__status__"],
         about["__license__"],

tikzplotlib/__about__.py

@@ -1,6 +1,6 @@
 __author__ = "Nico Schlömer"
 __email__ = "[email protected]"
-__copyright__ = "Copyright (c) 2010-2020, {} <{}>".format(__author__, __email__)
+__copyright__ = f"Copyright (c) 2010-2020, {__author__} <{__email__}>"
 __license__ = "License :: OSI Approved :: MIT License"
 __version__ = "0.8.7"
 __status__ = "Development Status :: 5 - Production/Stable"

tikzplotlib/_axes.py

@@ -44,14 +44,14 @@ def __init__(self, data, obj):  # noqa: C901
         data["current axis title"] = title
         if title:
             title = _common_texification(title)
-            self.axis_options.append("title={{{}}}".format(title))
+            self.axis_options.append(f"title={{{title}}}")
 
         # get axes titles
         xlabel = obj.get_xlabel()
         xrotation = obj.xaxis.get_label().get_rotation()
         if xlabel:
             xlabel = _common_texification(xlabel)
-            self.axis_options.append("xlabel={{{}}}".format(xlabel))
+            self.axis_options.append(f"xlabel={{{xlabel}}}")
             if xrotation != 0:
                 self.axis_options.append(
                     "xlabel style={{rotate={}}}".format(xrotation - 90)
@@ -60,7 +60,7 @@ def __init__(self, data, obj):  # noqa: C901
         yrotation = obj.yaxis.get_label().get_rotation()
         if ylabel:
             ylabel = _common_texification(ylabel)
-            self.axis_options.append("ylabel={{{}}}".format(ylabel))
+            self.axis_options.append(f"ylabel={{{ylabel}}}")
             if yrotation != 90:
                 self.axis_options.append(
                     "ylabel style={{rotate={}}}".format(yrotation - 90)
@@ -131,14 +131,14 @@ def __init__(self, data, obj):  # noqa: C901
         axcol = obj.spines["bottom"].get_edgecolor()
         data, col, _ = _color.mpl_color2xcolor(data, axcol)
         if col != "black":
-            self.axis_options.append("axis line style={{{}}}".format(col))
+            self.axis_options.append(f"axis line style={{{col}}}")
 
         # background color
         bgcolor = obj.get_facecolor()
 
         data, col, _ = _color.mpl_color2xcolor(data, bgcolor)
         if col != "white":
-            self.axis_options.append("axis background/.style={{fill={}}}".format(col))
+            self.axis_options.append(f"axis background/.style={{fill={col}}}")
 
         # find color bar
         colorbar = _find_associated_colorbar(obj)
@@ -229,7 +229,7 @@ def _ticks(self, data, obj):
         else:
             c0 = l0.get_color()
             data, xtickcolor, _ = _color.mpl_color2xcolor(data, c0)
-            self.axis_options.append("xtick style={{color={}}}".format(xtickcolor))
+            self.axis_options.append(f"xtick style={{color={xtickcolor}}}")
 
         try:
             l0 = obj.get_yticklines()[0]
@@ -238,7 +238,7 @@ def _ticks(self, data, obj):
         else:
             c0 = l0.get_color()
             data, ytickcolor, _ = _color.mpl_color2xcolor(data, c0)
-            self.axis_options.append("ytick style={{color={}}}".format(ytickcolor))
+            self.axis_options.append(f"ytick style={{color={ytickcolor}}}")
 
         # Find tick direction
         # For new matplotlib versions, we could replace the direction getter by
@@ -286,7 +286,7 @@ def _ticks(self, data, obj):
         y_tick_position_string, y_tick_position = _get_tick_position(obj, "y")
 
         if x_tick_position == y_tick_position and x_tick_position is not None:
-            self.axis_options.append("tick pos={}".format(x_tick_position))
+            self.axis_options.append(f"tick pos={x_tick_position}")
         else:
             self.axis_options.append(x_tick_position_string)
             self.axis_options.append(y_tick_position_string)
@@ -307,7 +307,7 @@ def _grid(self, obj, data):
             xgridcolor = xlines[0].get_color()
             data, col, _ = _color.mpl_color2xcolor(data, xgridcolor)
             if col != "black":
-                self.axis_options.append("x grid style={{{}}}".format(col))
+                self.axis_options.append(f"x grid style={{{col}}}")
 
         if obj.yaxis._gridOnMajor:
             self.axis_options.append("ymajorgrids")
@@ -319,7 +319,7 @@ def _grid(self, obj, data):
             ygridcolor = ylines[0].get_color()
             data, col, _ = _color.mpl_color2xcolor(data, ygridcolor)
             if col != "black":
-                self.axis_options.append("y grid style={{{}}}".format(col))
+                self.axis_options.append(f"y grid style={{{col}}}")
 
         return
 
@@ -435,7 +435,7 @@ def _subplot(self, obj, data):
 
     def _get_label_rotation_and_horizontal_alignment(self, obj, data, x_or_y):
         tick_label_text_width = None
-        tick_label_text_width_identifier = "{} tick label text width".format(x_or_y)
+        tick_label_text_width_identifier = f"{x_or_y} tick label text width"
         if tick_label_text_width_identifier in self.axis_options:
             self.axis_options.remove(tick_label_text_width_identifier)
 
@@ -473,7 +473,7 @@ def _get_label_rotation_and_horizontal_alignment(self, obj, data, x_or_y):
             # been passed in the 'extra' parameter
             if tick_label_text_width:
                 values.append("align={}".format(tick_labels_horizontal_alignment[0]))
-                values.append("text width={}".format(tick_label_text_width))
+                values.append(f"text width={tick_label_text_width}")
 
             if values:
                 label_style = "{}ticklabel style = {{{}}}".format(
@@ -498,7 +498,7 @@ def _get_label_rotation_and_horizontal_alignment(self, obj, data, x_or_y):
                     values.append(
                         "align={}".format(tick_labels_horizontal_alignment[0])
                     )
-                    values.append("text width={}".format(tick_label_text_width))
+                    values.append(f"text width={tick_label_text_width}")
                 else:
                     for idx, x in enumerate(tick_labels_horizontal_alignment):
                         label_style += "{}_tick_label_ha_{}/.initial = {}".format(
@@ -510,7 +510,7 @@ def _get_label_rotation_and_horizontal_alignment(self, obj, data, x_or_y):
                             x_or_y
                         )
                     )
-                    values.append("text width={}".format(tick_label_text_width))
+                    values.append(f"text width={tick_label_text_width}")
 
             label_style = (
                 "every {} tick label/.style = {{\n"
@@ -537,7 +537,7 @@ def _get_tick_position(obj, axes_obj):
 
     major_ticks_position = None
     if not major_ticks_bottom_show_all and not major_ticks_top_show_all:
-        position_string = "{}majorticks=false".format(axes_obj)
+        position_string = f"{axes_obj}majorticks=false"
     elif major_ticks_bottom_show_all and major_ticks_top_show_all:
         major_ticks_position = "both"
     elif major_ticks_bottom_show_all:
@@ -546,7 +546,7 @@ def _get_tick_position(obj, axes_obj):
         major_ticks_position = "right"
 
     if major_ticks_position:
-        position_string = "{}tick pos={}".format(axes_obj, major_ticks_position)
+        position_string = f"{axes_obj}tick pos={major_ticks_position}"
 
     return position_string, major_ticks_position
 
@@ -593,7 +593,7 @@ def _get_ticks(data, xy, ticks, ticklabels):
             )
         else:
             val = "{}" if "minor" in xy else "\\empty"
-            axis_options.append("{}tick={}".format(xy, val))
+            axis_options.append(f"{xy}tick={val}")
 
         if is_label_required:
             axis_options.append(

tikzplotlib/_legend.py

@@ -49,22 +49,22 @@ def draw_legend(data, obj):
             ("at={{(" + ff + "," + ff + ")}}").format(position[0], position[1])
         )
     if anchor:
-        legend_style.append("anchor={}".format(anchor))
+        legend_style.append(f"anchor={anchor}")
 
     # Get the edgecolor of the box
     if obj.get_frame_on():
         edgecolor = obj.get_frame().get_edgecolor()
         data, frame_xcolor, _ = mycol.mpl_color2xcolor(data, edgecolor)
         if frame_xcolor != "black":  # black is default
-            legend_style.append("draw={}".format(frame_xcolor))
+            legend_style.append(f"draw={frame_xcolor}")
     else:
         legend_style.append("draw=none")
 
     # Get the facecolor of the box
     facecolor = obj.get_frame().get_facecolor()
     data, fill_xcolor, _ = mycol.mpl_color2xcolor(data, facecolor)
     if fill_xcolor != "white":  # white is default
-        legend_style.append("fill={}".format(fill_xcolor))
+        legend_style.append(f"fill={fill_xcolor}")
 
     # Get the horizontal alignment
     try:
@@ -80,11 +80,11 @@ def draw_legend(data, obj):
 
     if alignment:
         data["current axes"].axis_options.append(
-            "legend cell align={{{}}}".format(alignment)
+            f"legend cell align={{{alignment}}}"
         )
 
     if obj._ncol != 1:
-        data["current axes"].axis_options.append("legend columns={}".format(obj._ncol))
+        data["current axes"].axis_options.append(f"legend columns={obj._ncol}")
 
     # Write styles to data
     if legend_style:

tikzplotlib/_line2d.py

@@ -48,11 +48,11 @@ def draw_line2d(data, obj):
             style = "const plot mark right"
         elif drawstyle == "steps-post":
             style = "const plot mark left"
-        addplot_options.append("{}".format(style))
+        addplot_options.append(f"{style}")
 
     alpha = obj.get_alpha()
     if alpha is not None:
-        addplot_options.append("opacity={}".format(alpha))
+        addplot_options.append(f"opacity={alpha}")
 
     linestyle = mypath.mpl_linestyle2pgfplots_linestyle(obj.get_linestyle(), line=obj)
     if linestyle is not None and linestyle != "solid":
@@ -93,7 +93,7 @@ def draw_line2d(data, obj):
     content += c
 
     if legend_text is not None:
-        content.append("\\addlegendentry{{{}}}\n".format(legend_text))
+        content.append(f"\\addlegendentry{{{legend_text}}}\n")
 
     return data, content
 
@@ -143,12 +143,12 @@ def _marker(
         # make sure we didn't round off to zero by accident
         if pgf_size == 0 and mark_size != 0:
             pgf_size = 1
-        addplot_options.append("mark size={:d}".format(pgf_size))
+        addplot_options.append(f"mark size={pgf_size:d}")
 
     mark_every = obj.get_markevery()
     if mark_every:
         if type(mark_every) is int:
-            addplot_options.append("mark repeat={:d}".format(mark_every))
+            addplot_options.append(f"mark repeat={mark_every:d}")
         else:
             # python starts at index 0, pgfplots at index 1
             pgf_marker = [1 + m for m in mark_every]

tikzplotlib/_patch.py

@@ -149,7 +149,7 @@ def _draw_rectangle(data, obj, draw_options):
         cont += "\\addlegendimage{{ybar,ybar legend,{}}};\n".format(
             ",".join(draw_options)
         )
-        cont += "\\addlegendentry{{{}}}\n\n".format(label)
+        cont += f"\\addlegendentry{{{label}}}\n\n"
     return data, cont
 
 

tikzplotlib/_path.py

@@ -202,7 +202,7 @@ def draw_pathcollection(data, obj):
         data, pgfplots_marker, marker_options = _mpl_marker2pgfp_marker(
             data, marker0, fc
         )
-        draw_options += ["marker={}".format(pgfplots_marker)] + marker_options
+        draw_options += [f"marker={pgfplots_marker}"] + marker_options
 
     # `only mark` plots don't need linewidth
     data, extra_draw_options = get_draw_options(data, obj, ec, fc, ls, None)
@@ -236,10 +236,10 @@ def draw_pathcollection(data, obj):
             )
 
         do = " [{}]".format(", ".join(draw_options)) if draw_options else ""
-        content.append("\\addplot{}\n".format(do))
+        content.append(f"\\addplot{do}\n")
 
         to = " [{}]".format(", ".join(table_options)) if table_options else ""
-        content.append("table{}{{%\n".format(to))
+        content.append(f"table{to}{{%\n")
 
         content.append((" ".join(labels)).strip() + "\n")
         ff = data["float format"]
@@ -249,7 +249,7 @@ def draw_pathcollection(data, obj):
         content.append("};\n")
 
     if legend_text is not None:
-        content.append("\\addlegendentry{{{}}}\n".format(legend_text))
+        content.append(f"\\addlegendentry{{{legend_text}}}\n")
 
     return data, content
 
@@ -274,15 +274,15 @@ def get_draw_options(data, obj, ec, fc, ls, lw, hatch=None):
     if ec is not None:
         data, ec_col, ec_rgba = _color.mpl_color2xcolor(data, ec)
         if ec_rgba[3] > 0:
-            draw_options.append("draw={}".format(ec_col))
+            draw_options.append(f"draw={ec_col}")
         else:
             draw_options.append("draw=none")
 
     if fc is not None:
         data, fc_col, fc_rgba = _color.mpl_color2xcolor(data, fc)
         if fc_rgba[3] > 0.0:
             # Don't draw if it's invisible anyways.
-            draw_options.append("fill={}".format(fc_col))
+            draw_options.append(f"fill={fc_col}")
 
     # handle transparency
     ff = data["float format"]
@@ -352,7 +352,7 @@ def mpl_linewidth2pgfp_linewidth(data, line_width):
             }[line_width]
         except KeyError:
             # explicit line width
-            return "line width={}pt".format(line_width)
+            return f"line width={line_width}pt"
 
     # The following is an alternative approach to line widths.
     # The default line width in matplotlib is 1.0pt, in PGFPlots 0.4pt
@@ -415,7 +415,7 @@ def mpl_linestyle2pgfplots_linestyle(line_style, line=None):
             lst.append("dash pattern=" + format_string.format(*dashSeq))
 
         if dashOffset != default_dashOffset:
-            lst.append("dash phase={}pt".format(dashOffset))
+            lst.append(f"dash phase={dashOffset}pt")
 
         if len(lst) > 0:
             return ", ".join(lst)

tikzplotlib/_save.py

@@ -202,7 +202,7 @@ def get_tikz_code(
     code = """"""
 
     if include_disclaimer:
-        disclaimer = "This file was created by tikzplotlib v{}.".format(__version__)
+        disclaimer = f"This file was created by tikzplotlib v{__version__}."
         code += _tex_comment(disclaimer)
 
     # write the contents

tikzplotlib/_text.py

@@ -62,7 +62,7 @@ def draw_text(data, obj):
     if anchor is not None:
         properties.append(anchor)
     data, col, _ = _color.mpl_color2xcolor(data, converter.to_rgb(obj.get_color()))
-    properties.append("text={}".format(col))
+    properties.append(f"text={col}")
     properties.append("rotate={:.1f}".format(obj.get_rotation()))
 
     if obj.get_style() == "italic":
@@ -108,7 +108,7 @@ def draw_text(data, obj):
 
     if "\n" in text:
         # http://tex.stackexchange.com/a/124114/13262
-        properties.append("align={}".format(ha))
+        properties.append(f"align={ha}")
         # Manipulating the text here is actually against mpl2tikz's policy not
         # to do that. On the other hand, newlines should translate into
         # newlines.
@@ -187,7 +187,7 @@ def _get_arrow_style(obj, data):
     try:
         style = arrow_translate[style_cls]
     except KeyError:
-        raise NotImplementedError("Unknown arrow style {}".format(style_cls))
+        raise NotImplementedError(f"Unknown arrow style {style_cls}")
     else:
         data, col, _ = _color.mpl_color2xcolor(data, obj.get_ec())
         return style + ["draw=" + col]
@@ -231,10 +231,10 @@ def _bbox(bbox, data, properties, scaling):
     if bbox.get_fill():
         data, fc, _ = _color.mpl_color2xcolor(data, bbox.get_facecolor())
         if fc:
-            properties.append("fill={}".format(fc))
+            properties.append(f"fill={fc}")
     data, ec, _ = _color.mpl_color2xcolor(data, bbox.get_edgecolor())
     if ec:
-        properties.append("draw={}".format(ec))
+        properties.append(f"draw={ec}")
     # XXX: This is ugly, too
     ff = data["float format"]
     properties.append(("line width=" + ff + "pt").format(bbox.get_lw() * 0.4))