Merge pull request #24408 from PiotrStrzelczykX/pstrzelcz-fix-make_axes-parameters

tacaswell · web-flow · commit 011a3f7ea686 · 2022-12-15T12:08:53.000-05:00
Fix: restore make_axes to accept a tuple of axes
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -11,6 +11,7 @@
    End-users most likely won't need to directly use this module's API.
 """
 
+import collections.abc as collections_abc
 import logging
 
 import numpy as np
@@ -1394,7 +1395,7 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,
 
     Parameters
     ----------
-    parents : `~.axes.Axes` or list or `numpy.ndarray` of `~.axes.Axes`
+    parents : `~.axes.Axes` or sequence or `numpy.ndarray` of `~.axes.Axes`
         The Axes to use as parents for placing the colorbar.
     %(_make_axes_kw_doc)s
 
@@ -1420,7 +1421,7 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,
     # reuse them, leading to a memory leak
     if isinstance(parents, np.ndarray):
         parents = list(parents.flat)
-    elif not isinstance(parents, list):
+    elif not isinstance(parents, collections_abc.Sequence):
         parents = [parents]
     fig = parents[0].get_figure()
 
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -1195,7 +1195,7 @@ def colorbar(
         cax : `~matplotlib.axes.Axes`, optional
             Axes into which the colorbar will be drawn.
 
-        ax : `~.axes.Axes` or list or `numpy.ndarray` of Axes, optional
+        ax : `~.axes.Axes` or sequence or `numpy.ndarray` of Axes, optional
             One or more parent axes from which space for a new colorbar axes
             will be stolen, if *cax* is None.  This has no effect if *cax* is
             set.
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
@@ -1199,3 +1199,14 @@ def test_colorbar_errors(kwargs, error, message):
         kwargs['cax'] = ax.inset_axes([0, 1.05, 1, 0.05])
     with pytest.raises(error, match=message):
         fig.colorbar(im, **kwargs)
+
+
+def test_colorbar_axes_parmeters():
+    fig, ax = plt.subplots(2)
+    im = ax[0].imshow([[0, 1], [2, 3]])
+    # colorbar should accept any form of axes sequence:
+    fig.colorbar(im, ax=ax)
+    fig.colorbar(im, ax=ax[0])
+    fig.colorbar(im, ax=[_ax for _ax in ax])
+    fig.colorbar(im, ax=(ax[0], ax[1]))
+    fig.draw_without_rendering()
