Commit 011a3f7

authored

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

Fix: restore make_axes to accept a tuple of axes

2 parents a1da538 + a928cec commit 011a3f7Copy full SHA for 011a3f7

File tree

+15

-3

lines changed

+15

-3

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`End-users most likely won't need to directly use this module's API.`
`12`	`12`	`"""`
`13`	`13`
	`14`	`+import collections.abc as collections_abc`
`14`	`15`	`import logging`
`15`	`16`
`16`	`17`	`import numpy as np`
`@@ -1394,7 +1395,7 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,`
`1394`	`1395`
`1395`	`1396`	`Parameters`
`1396`	`1397`	`----------`
`1397`		- parents : `~.axes.Axes` or list or `numpy.ndarray` of `~.axes.Axes`
	`1398`	+ parents : `~.axes.Axes` or sequence or `numpy.ndarray` of `~.axes.Axes`
`1398`	`1399`	`The Axes to use as parents for placing the colorbar.`
`1399`	`1400`	`%(_make_axes_kw_doc)s`
`1400`	`1401`
`@@ -1420,7 +1421,7 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,`
`1420`	`1421`	`# reuse them, leading to a memory leak`
`1421`	`1422`	`if isinstance(parents, np.ndarray):`
`1422`	`1423`	`parents = list(parents.flat)`
`1423`		`- elif not isinstance(parents, list):`
	`1424`	`+ elif not isinstance(parents, collections_abc.Sequence):`
`1424`	`1425`	`parents = [parents]`
`1425`	`1426`	`fig = parents[0].get_figure()`
`1426`	`1427`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1195,7 +1195,7 @@ def colorbar(`
`1195`	`1195`	cax : `~matplotlib.axes.Axes`, optional
`1196`	`1196`	`Axes into which the colorbar will be drawn.`
`1197`	`1197`
`1198`		- ax : `~.axes.Axes` or list or `numpy.ndarray` of Axes, optional
	`1198`	+ ax : `~.axes.Axes` or sequence or `numpy.ndarray` of Axes, optional
`1199`	`1199`	`One or more parent axes from which space for a new colorbar axes`
`1200`	`1200`	`will be stolen, if cax is None. This has no effect if cax is`
`1201`	`1201`	`set.`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1199,3 +1199,14 @@ def test_colorbar_errors(kwargs, error, message):`
`1199`	`1199`	`kwargs['cax'] = ax.inset_axes([0, 1.05, 1, 0.05])`
`1200`	`1200`	`with pytest.raises(error, match=message):`
`1201`	`1201`	`fig.colorbar(im, **kwargs)`
	`1202`	`+`
	`1203`	`+`
	`1204`	`+def test_colorbar_axes_parmeters():`
	`1205`	`+ fig, ax = plt.subplots(2)`
	`1206`	`+ im = ax[0].imshow([[0, 1], [2, 3]])`
	`1207`	`+ # colorbar should accept any form of axes sequence:`
	`1208`	`+ fig.colorbar(im, ax=ax)`
	`1209`	`+ fig.colorbar(im, ax=ax[0])`
	`1210`	`+ fig.colorbar(im, ax=[_ax for _ax in ax])`
	`1211`	`+ fig.colorbar(im, ax=(ax[0], ax[1]))`
	`1212`	`+ fig.draw_without_rendering()`

Comments

(0)