Commit53faed9

authored

Merge pull request#16864 from timhoffm/legend-labels-str2

Check parameter type for legend(labels)

2 parentsda6dfab +a1a99cd commit53faed9Copy full SHA for 53faed9

File tree

+13

-2

lines changed

+13

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@`
`33`	`33`
`34`	`34`	`fig,ax=plt.subplots()`
`35`	`35`	`lines=ax.plot(data)`
`36`		`-ax.legend(lines)`
	`36`	`+ax.legend()`
`37`	`37`
`38`	`38`	`##############################################################################`
`39`		`-# Note thatone legenditem per line was created.`
	`39`	`+# Note thatno legendentries were created.`
`40`	`40`	`# In this case, we can compose a legend using Matplotlib objects that aren't`
`41`	`41`	`# explicitly tied to the data that was plotted. For example:`
`42`	`42`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1163,6 +1163,10 @@ def _parse_legend_args(axs, args, handles=None, labels=None, *kwargs):`
`1163`	`1163`	`# One argument. User defined labels - automatic handle detection.`
`1164`	`1164`	`eliflen(args)==1:`
`1165`	`1165`	`labels,=args`
	`1166`	`+ifany(isinstance(l,Artist)forlinlabels):`
	`1167`	`+raiseTypeError("A single argument passed to legend() must be a "`
	`1168`	`+"list of labels, but found an Artist in there.")`
	`1169`	`+`
`1166`	`1170`	`# Get as many handles as there are labels.`
`1167`	`1171`	`handles= [handleforhandle,label`
`1168`	`1172`	`inzip(_get_legend_handles(axs,handlers),labels)]`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,13 @@ def test_legend_handle_label(self):`
`234`	`234`	`plt.legend(lines, ['hello world'])`
`235`	`235`	`Legend.assert_called_with(plt.gca(),lines, ['hello world'])`
`236`	`236`
	`237`	`+deftest_legend_handles_only(self):`
	`238`	`+lines=plt.plot(range(10))`
	`239`	`+withpytest.raises(TypeError,match='but found an Artist'):`
	`240`	`+# a single arg is interpreted as labels`
	`241`	`+# it's a common error to just pass handles`
	`242`	`+plt.legend(lines)`
	`243`	`+`
`237`	`244`	`deftest_legend_no_args(self):`
`238`	`245`	`lines=plt.plot(range(10),label='hello world')`
`239`	`246`	`withmock.patch('matplotlib.legend.Legend')asLegend:`

Comments

(0)