Merge pull request #18793 from timhoffm/axs

tacaswell · web-flow · commit 8f7c391e7c62 · 2020-10-23T12:22:53.000-04:00
DOC: Consistently use axs to refer to a list of Axes (v2)
diff --git a/examples/text_labels_and_annotations/legend_demo.py b/examples/text_labels_and_annotations/legend_demo.py
@@ -63,8 +63,8 @@
 ###############################################################################
 # Here we attach legends to more complex plots.
 
-fig, axes = plt.subplots(3, 1, constrained_layout=True)
-top_ax, middle_ax, bottom_ax = axes
+fig, axs = plt.subplots(3, 1, constrained_layout=True)
+top_ax, middle_ax, bottom_ax = axs
 
 top_ax.bar([0, 1, 2], [0.2, 0.3, 0.1], width=0.4, label="Bar 1",
            align="center")
diff --git a/lib/matplotlib/tests/test_legend.py b/lib/matplotlib/tests/test_legend.py
@@ -164,9 +164,9 @@ def test_rc():
 def test_legend_expand():
     """Test expand mode"""
     legend_modes = [None, "expand"]
-    fig, axes_list = plt.subplots(len(legend_modes), 1)
+    fig, axs = plt.subplots(len(legend_modes), 1)
     x = np.arange(100)
-    for ax, mode in zip(axes_list, legend_modes):
+    for ax, mode in zip(axs, legend_modes):
         ax.plot(x, 50 - x, 'o', label='y=1')
         l1 = ax.legend(loc='upper left', mode=mode)
         ax.add_artist(l1)
diff --git a/tutorials/colors/colormaps.py b/tutorials/colors/colormaps.py
@@ -205,19 +205,19 @@
 
 
 def plot_color_gradients(cmap_category, cmap_list, nrows):
-    fig, axes = plt.subplots(nrows=nrows)
+    fig, axs = plt.subplots(nrows=nrows)
     fig.subplots_adjust(top=0.95, bottom=0.01, left=0.2, right=0.99)
-    axes[0].set_title(cmap_category + ' colormaps', fontsize=14)
+    axs[0].set_title(cmap_category + ' colormaps', fontsize=14)
 
-    for ax, name in zip(axes, cmap_list):
+    for ax, name in zip(axs, cmap_list):
         ax.imshow(gradient, aspect='auto', cmap=plt.get_cmap(name))
         pos = list(ax.get_position().bounds)
         x_text = pos[0] - 0.01
         y_text = pos[1] + pos[3]/2.
         fig.text(x_text, y_text, name, va='center', ha='right', fontsize=10)
 
     # Turn off *all* ticks & spines, not just the ones with colormaps.
-    for ax in axes:
+    for ax in axs:
         ax.set_axis_off()
 
 
@@ -258,10 +258,10 @@ def plot_color_gradients(cmap_category, cmap_list, nrows):
     nsubplots = int(np.ceil(len(cmap_list) / dsub))
 
     # squeeze=False to handle similarly the case of a single subplot
-    fig, axes = plt.subplots(nrows=nsubplots, squeeze=False,
-                             figsize=(7, 2.6*nsubplots))
+    fig, axs = plt.subplots(nrows=nsubplots, squeeze=False,
+                            figsize=(7, 2.6*nsubplots))
 
-    for i, ax in enumerate(axes.flat):
+    for i, ax in enumerate(axs.flat):
 
         locs = []  # locations for text labels
 
@@ -300,7 +300,7 @@ def plot_color_gradients(cmap_category, cmap_list, nrows):
         # Set up the axis limits:
         #   * the 1st subplot is used as a reference for the x-axis limits
         #   * lightness values goes from 0 to 100 (y-axis limits)
-        ax.set_xlim(axes[0, 0].get_xlim())
+        ax.set_xlim(axs[0, 0].get_xlim())
         ax.set_ylim(0.0, 100.0)
 
         # Set up labels for colormaps
@@ -364,12 +364,12 @@ def plot_color_gradients(cmap_category, cmap_list, nrows):
 
 
 def plot_color_gradients(cmap_category, cmap_list):
-    fig, axes = plt.subplots(nrows=len(cmap_list), ncols=2)
+    fig, axs = plt.subplots(nrows=len(cmap_list), ncols=2)
     fig.subplots_adjust(top=0.95, bottom=0.01, left=0.2, right=0.99,
                         wspace=0.05)
     fig.suptitle(cmap_category + ' colormaps', fontsize=14, y=1.0, x=0.6)
 
-    for ax, name in zip(axes, cmap_list):
+    for ax, name in zip(axs, cmap_list):
 
         # Get RGB values for colormap.
         rgb = cm.get_cmap(plt.get_cmap(name))(x)[np.newaxis, :, :3]
@@ -387,7 +387,7 @@ def plot_color_gradients(cmap_category, cmap_list):
         fig.text(x_text, y_text, name, va='center', ha='right', fontsize=10)
 
     # Turn off *all* ticks & spines, not just the ones with colormaps.
-    for ax in axes.flat:
+    for ax in axs.flat:
         ax.set_axis_off()
 
     plt.show()
