Merge pull request #23822 from meeseeksmachine/auto-backport-of-pr-23813-on-v3.6.x

jklymak · web-flow · commit b32632e1f0d5 · 2022-09-07T21:54:54.000-07:00
Backport PR #23813 on branch v3.6.x (Triplot duplicated label)
diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py
@@ -1299,3 +1299,15 @@ def test_triplot_with_ls(fig_test, fig_ref):
     data = [[0, 1, 2]]
     fig_test.subplots().triplot(x, y, data, ls='--')
     fig_ref.subplots().triplot(x, y, data, linestyle='--')
+
+
+def test_triplot_label():
+    x = [0, 2, 1]
+    y = [0, 0, 1]
+    data = [[0, 1, 2]]
+    fig, ax = plt.subplots()
+    lines, markers = ax.triplot(x, y, data, label='label')
+    handles, labels = ax.get_legend_handles_labels()
+    assert labels == ['label']
+    assert len(handles) == 1
+    assert handles[0] is lines
diff --git a/lib/matplotlib/tri/triplot.py b/lib/matplotlib/tri/triplot.py
@@ -77,6 +77,7 @@ def triplot(ax, *args, **kwargs):
         **kw,
         'linestyle': 'None',  # No line to draw.
     }
+    kw_markers.pop('label', None)
     if marker not in [None, 'None', '', ' ']:
         tri_markers = ax.plot(x, y, **kw_markers)
     else:

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ def triplot(ax, args, *kwargs):`
`77`	`77`	`**kw,`
`78`	`78`	`'linestyle': 'None', # No line to draw.`
`79`	`79`	`}`
	`80`	`+ kw_markers.pop('label', None)`
`80`	`81`	`if marker not in [None, 'None', '', ' ']:`
`81`	`82`	`tri_markers = ax.plot(x, y, **kw_markers)`
`82`	`83`	`else:`