Commit7f5335a

authored

Merge pull request#24737 from tacaswell/mnt/forgiving_colorbar_input

MNT: make fig.colorbar(..., ax=INPUT) even more forgiving

2 parents12402f4 +06396e2 commit7f5335aCopy full SHA for 7f5335a

File tree

-4

lines changed

-4

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@`
`11`	`11`	`End-users most likely won't need to directly use this module's API.`
`12`	`12`	`"""`
`13`	`13`
`14`		`-importcollections.abcascollections_abc`
`15`	`14`	`importlogging`
`16`	`15`
`17`	`16`	`importnumpyasnp`
`@@ -1395,7 +1394,7 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,`
`1395`	`1394`
`1396`	`1395`	`Parameters`
`1397`	`1396`	`----------`
`1398`		- parents : `~.axes.Axes` orsequence or `numpy.ndarray` of `~.axes.Axes`
	`1397`	+ parents : `~.axes.Axes` oriterable or `numpy.ndarray` of `~.axes.Axes`
`1399`	`1398`	`The Axes to use as parents for placing the colorbar.`
`1400`	`1399`	`%(_make_axes_kw_doc)s`
`1401`	`1400`
`@@ -1421,8 +1420,11 @@ def make_axes(parents, location=None, orientation=None, fraction=0.15,`
`1421`	`1420`	`# reuse them, leading to a memory leak`
`1422`	`1421`	`ifisinstance(parents,np.ndarray):`
`1423`	`1422`	`parents=list(parents.flat)`
`1424`		`-elifnotisinstance(parents,collections_abc.Sequence):`
	`1423`	`+elifnp.iterable(parents):`
	`1424`	`+parents=list(parents)`
	`1425`	`+else:`
`1425`	`1426`	`parents= [parents]`
	`1427`	`+`
`1426`	`1428`	`fig=parents[0].get_figure()`
`1427`	`1429`
`1428`	`1430`	`pad0=0.05iffig.get_constrained_layout()elseloc_settings['pad']`

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` orsequence or `numpy.ndarray` of Axes, optional
	`1198`	+ ax : `~.axes.Axes` oriterable 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: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1209,4 +1209,5 @@ def test_colorbar_axes_parmeters():`
`1209`	`1209`	`fig.colorbar(im,ax=ax[0])`
`1210`	`1210`	`fig.colorbar(im,ax=[_axfor_axinax])`
`1211`	`1211`	`fig.colorbar(im,ax=(ax[0],ax[1]))`
	`1212`	`+fig.colorbar(im,ax={i:_axfori,_axinenumerate(ax)}.values())`
`1212`	`1213`	`fig.draw_without_rendering()`

Comments

(0)