small fixes

Author: nschloe

tikzplotlib/_image.py

@@ -1,4 +1,4 @@
-import matplotlib as mpl
+import matplotlib.pyplot as plt
 import numpy as np
 import PIL
 
@@ -9,16 +9,16 @@ def draw_image(data, obj):
     """Returns the PGFPlots code for an image environment."""
     content = []
 
-    filename, rel_filepath = _files.new_filename(data, "img", ".png")
+    filepath, rel_filepath = _files.new_filepath(data, "img", ".png")
 
     # store the image as in a file
     img_array = obj.get_array()
 
     dims = img_array.shape
     if len(dims) == 2:  # the values are given as one real number: look at cmap
         clims = obj.get_clim()
-        mpl.pyplot.imsave(
-            fname=filename,
+        plt.imsave(
+            fname=filepath,
             arr=img_array,
             cmap=obj.get_cmap(),
             vmin=clims[0],
@@ -40,7 +40,7 @@ def draw_image(data, obj):
         # If the input image is PIL:
         # image = PIL.Image.fromarray(img_array)
 
-        image.save(filename, origin=obj.origin)
+        image.save(filepath, origin=obj.origin)
 
     # write the corresponding information to the TikZ file
     extent = obj.get_extent()

tikzplotlib/_line2d.py

@@ -45,9 +45,10 @@ def draw_line2d(data, obj):
             style = "const plot mark mid"
         elif drawstyle in ["steps-pre", "steps"]:
             style = "const plot mark right"
-        elif drawstyle == "steps-post":
+        else:
+            assert drawstyle == "steps-post"
             style = "const plot mark left"
-        addplot_options.append(f"{style}")
+        addplot_options.append(style)
 
     alpha = obj.get_alpha()
     if alpha is not None:
@@ -279,8 +280,8 @@ def _table(obj, data):  # noqa: C901
         plot_table.append(f"{x:{xformat}}{col_sep}{y:{ff}}{table_row_sep}")
 
     if data["externalize tables"]:
-        filename, rel_filepath = _files.new_filename(data, "table", ".tsv")
-        with open(filename, "w") as f:
+        filepath, rel_filepath = _files.new_filepath(data, "table", ".tsv")
+        with open(filepath, "w") as f:
             # No encoding handling required: plot_table is only ASCII
             f.write("".join(plot_table))
         content.append(rel_filepath)

tikzplotlib/_quadmesh.py

@@ -10,7 +10,7 @@ def draw_quadmesh(data, obj):
     content = []
 
     # Generate file name for current object
-    filename, rel_filepath = _files.new_filename(data, "img", ".png")
+    filepath, rel_filepath = _files.new_filepath(data, "img", ".png")
 
     # Get the dpi for rendering and store the original dpi of the figure
     dpi = data["dpi"]
@@ -42,7 +42,7 @@ def draw_quadmesh(data, obj):
         int(round(cbox.extents[3] - cbox.extents[1])),
     )
     cropped = image.crop(box)
-    cropped.save(filename)
+    cropped.save(filepath)
 
     # Restore the original dpi of the figure
     obj.figure.set_dpi(fig_dpi)