Merge pull request matplotlib#24837 from QuLogic/ui-fstring

Author: greglucas

examples/event_handling/resample.py

@@ -45,7 +45,7 @@ def downsample(self, xstart, xend):
         xdata = xdata[::ratio]
         ydata = ydata[::ratio]
 
-        print("using {} of {} visible points".format(len(ydata), np.sum(mask)))
+        print(f"using {len(ydata)} of {np.sum(mask)} visible points")
 
         return xdata, ydata
 

examples/images_contours_and_fields/contour_corner_mask.py

@@ -27,7 +27,7 @@
 for ax, corner_mask in zip(axs, corner_masks):
     cs = ax.contourf(x, y, z, corner_mask=corner_mask)
     ax.contour(cs, colors='k')
-    ax.set_title('corner_mask = {0}'.format(corner_mask))
+    ax.set_title(f'{corner_mask=}')
 
     # Plot grid.
     ax.grid(c='k', ls='-', alpha=0.3)

examples/images_contours_and_fields/image_annotated_heatmap.py

@@ -252,8 +252,8 @@ def annotate_heatmap(im, data=None, valfmt="{x:.2f}",
 # use an integer format on the annotations and provide some colors.
 
 data = np.random.randint(2, 100, size=(7, 7))
-y = ["Book {}".format(i) for i in range(1, 8)]
-x = ["Store {}".format(i) for i in list("ABCDEFG")]
+y = [f"Book {i}" for i in range(1, 8)]
+x = [f"Store {i}" for i in list("ABCDEFG")]
 im, _ = heatmap(data, y, x, ax=ax2, vmin=0,
                 cmap="magma_r", cbarlabel="weekly sold copies")
 annotate_heatmap(im, valfmt="{x:d}", size=7, threshold=20,
@@ -265,8 +265,8 @@ def annotate_heatmap(im, data=None, valfmt="{x:.2f}",
 # labels from an array of classes.
 
 data = np.random.randn(6, 6)
-y = ["Prod. {}".format(i) for i in range(10, 70, 10)]
-x = ["Cycle {}".format(i) for i in range(1, 7)]
+y = [f"Prod. {i}" for i in range(10, 70, 10)]
+x = [f"Cycle {i}" for i in range(1, 7)]
 
 qrates = list("ABCDEFG")
 norm = matplotlib.colors.BoundaryNorm(np.linspace(-3.5, 3.5, 8), 7)
@@ -292,7 +292,7 @@ def annotate_heatmap(im, data=None, valfmt="{x:.2f}",
 
 
 def func(x, pos):
-    return "{:.2f}".format(x).replace("0.", ".").replace("1.00", "")
+    return f"{x:.2f}".replace("0.", ".").replace("1.00", "")
 
 annotate_heatmap(im, valfmt=matplotlib.ticker.FuncFormatter(func), size=7)
 

examples/lines_bars_and_markers/eventplot_demo.py

@@ -20,7 +20,7 @@
 data1 = np.random.random([6, 50])
 
 # set different colors for each set of positions
-colors1 = ['C{}'.format(i) for i in range(6)]
+colors1 = [f'C{i}' for i in range(6)]
 
 # set different line properties for each set of positions
 # note that some overlap

examples/lines_bars_and_markers/filled_step.py

@@ -49,17 +49,16 @@ def filled_hist(ax, edges, values, bottoms=None, orientation='v',
     """
     print(orientation)
     if orientation not in 'hv':
-        raise ValueError("orientation must be in {{'h', 'v'}} "
-                         "not {o}".format(o=orientation))
+        raise ValueError(f"orientation must be in {{'h', 'v'}} "
+                         f"not {orientation}")
 
     kwargs.setdefault('step', 'post')
     kwargs.setdefault('alpha', 0.7)
     edges = np.asarray(edges)
     values = np.asarray(values)
     if len(edges) - 1 != len(values):
-        raise ValueError('Must provide one more bin edge than value not: '
-                         'len(edges): {lb} len(values): {lv}'.format(
-                             lb=len(edges), lv=len(values)))
+        raise ValueError(f'Must provide one more bin edge than value not: '
+                         f'{len(edges)=} {len(values)=}')
 
     if bottoms is None:
         bottoms = 0
@@ -159,7 +158,7 @@ def stack_hist(ax, stacked_data, sty_cycle, bottoms=None,
     arts = {}
     for j, (data, label, sty) in loop_iter:
         if label is None:
-            label = 'dflt set {n}'.format(n=j)
+            label = f'dflt set {j}'
         label = sty.pop('label', label)
         vals, edges = hist_func(data)
         if bottoms is None:
@@ -182,7 +181,7 @@ def stack_hist(ax, stacked_data, sty_cycle, bottoms=None,
 
 # set up style cycles
 color_cycle = cycler(facecolor=plt.rcParams['axes.prop_cycle'][:4])
-label_cycle = cycler(label=['set {n}'.format(n=n) for n in range(4)])
+label_cycle = cycler(label=[f'set {n}' for n in range(4)])
 hatch_cycle = cycler(hatch=['/', '*', '+', '|'])
 
 # Fixing random state for reproducibility

examples/misc/table_demo.py

@@ -51,7 +51,7 @@
 # Adjust layout to make room for the table:
 plt.subplots_adjust(left=0.2, bottom=0.2)
 
-plt.ylabel("Loss in ${0}'s".format(value_increment))
+plt.ylabel(f"Loss in ${value_increment}'s")
 plt.yticks(values * value_increment, ['%d' % val for val in values])
 plt.xticks([])
 plt.title('Loss by Disaster')

examples/pie_and_polar_charts/pie_and_donut_labels.py

@@ -44,7 +44,7 @@
 
 def func(pct, allvals):
     absolute = int(np.round(pct/100.*np.sum(allvals)))
-    return "{:.1f}%\n({:d} g)".format(pct, absolute)
+    return f"{pct:.1f}%\n({absolute:d} g)"
 
 
 wedges, texts, autotexts = ax.pie(data, autopct=lambda pct: func(pct, data),
@@ -108,7 +108,7 @@ def func(pct, allvals):
     y = np.sin(np.deg2rad(ang))
     x = np.cos(np.deg2rad(ang))
     horizontalalignment = {-1: "right", 1: "left"}[int(np.sign(x))]
-    connectionstyle = "angle,angleA=0,angleB={}".format(ang)
+    connectionstyle = f"angle,angleA=0,angleB={ang}"
     kw["arrowprops"].update({"connectionstyle": connectionstyle})
     ax.annotate(recipe[i], xy=(x, y), xytext=(1.35*np.sign(x), 1.4*y),
                 horizontalalignment=horizontalalignment, **kw)

examples/scales/asinh_demo.py

@@ -68,7 +68,7 @@
 fig2 = plt.figure(constrained_layout=True)
 axs = fig2.subplots(1, 3, sharex=True)
 for ax, (a0, base) in zip(axs, ((0.2, 2), (1.0, 0), (5.0, 10))):
-    ax.set_title('linear_width={:.3g}'.format(a0))
+    ax.set_title(f'linear_width={a0:.3g}')
     ax.plot(x, x, label='y=x')
     ax.plot(x, 10*x, label='y=10x')
     ax.plot(x, 100*x, label='y=100x')

examples/specialty_plots/topographic_hillshading.py

@@ -58,7 +58,7 @@
 
 # Label rows and columns
 for ax, ve in zip(axs[0], [0.1, 1, 10]):
-    ax.set_title('{0}'.format(ve), size=18)
+    ax.set_title(f'{ve}', size=18)
 for ax, mode in zip(axs[:, 0], ['Hillshade', 'hsv', 'overlay', 'soft']):
     ax.set_ylabel(mode, size=18)
 

examples/subplots_axes_and_figures/axes_margins.py

@@ -69,7 +69,7 @@ def f(t):
     )  # not sticky
     ax.margins(x=0.1, y=0.05)
     ax.set_aspect('equal')
-    ax.set_title('{} Sticky'.format(status))
+    ax.set_title(f'{status} Sticky')
 
 plt.show()