Commit a928cec

committed

Fix: restore make_axes to accept a tuple of axes

Allow to pass a tuple of axes as "ax" parameter of make_axes function Signed-off-by: Strzelczyk, Piotr <piotr.strzelczyk@intel.com>

1 parent 8d8ae7f commit a928cecCopy full SHA for a928cec

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`
`@@ -1403,7 +1404,7 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,`
`1403`	`1404`
`1404`	`1405`	`Parameters`
`1405`	`1406`	`----------`
`1406`		- parents : `~.axes.Axes` or list or `numpy.ndarray` of `~.axes.Axes`
	`1407`	+ parents : `~.axes.Axes` or sequence or `numpy.ndarray` of `~.axes.Axes`
`1407`	`1408`	`The Axes to use as parents for placing the colorbar.`
`1408`	`1409`	`%(_make_axes_kw_doc)s`
`1409`	`1410`
`@@ -1429,7 +1430,7 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,`
`1429`	`1430`	`# reuse them, leading to a memory leak`
`1430`	`1431`	`if isinstance(parents, np.ndarray):`
`1431`	`1432`	`parents = list(parents.flat)`
`1432`		`- elif not isinstance(parents, list):`
	`1433`	`+ elif not isinstance(parents, collections_abc.Sequence):`
`1433`	`1434`	`parents = [parents]`
`1434`	`1435`	`fig = parents[0].get_figure()`
`1435`	`1436`

Lines changed: 1 addition & 1 deletion

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

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1188,3 +1188,14 @@ def test_colorbar_errors(kwargs, error, message):`
`1188`	`1188`	`kwargs['cax'] = ax.inset_axes([0, 1.05, 1, 0.05])`
`1189`	`1189`	`with pytest.raises(error, match=message):`
`1190`	`1190`	`fig.colorbar(im, **kwargs)`
	`1191`	`+`
	`1192`	`+`
	`1193`	`+def test_colorbar_axes_parmeters():`
	`1194`	`+ fig, ax = plt.subplots(2)`
	`1195`	`+ im = ax[0].imshow([[0, 1], [2, 3]])`
	`1196`	`+ # colorbar should accept any form of axes sequence:`
	`1197`	`+ fig.colorbar(im, ax=ax)`
	`1198`	`+ fig.colorbar(im, ax=ax[0])`
	`1199`	`+ fig.colorbar(im, ax=[_ax for _ax in ax])`
	`1200`	`+ fig.colorbar(im, ax=(ax[0], ax[1]))`
	`1201`	`+ fig.draw_without_rendering()`

Comments

(0)