Merge pull request #7676 from nepix32/nepix32-patch-1

NelleV · web-flow · commit 159f36edcce7 · 2016-12-31T23:49:06.000+01:00
Makes eventplot legend work
diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py
@@ -267,7 +267,7 @@ def get_numpoints(self, legend):
             return self._numpoints
 
     def _default_update_prop(self, legend_handle, orig_handle):
-        lw = orig_handle.get_linewidth()[0]
+        lw = orig_handle.get_linewidths()[0]
         dashes = orig_handle.get_dashes()[0]
         color = orig_handle.get_colors()[0]
         legend_handle.set_color(color)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -4871,3 +4871,9 @@ def test_scatter_color_masking():
     assert_array_equal(facecolors[1], np.array([0, 0, 0, 1]))
     assert_array_equal(linecolors[1], np.array([0, 0, 0, 1]))
     assert linewidths[1] == 3
+
+
+@cleanup
+def test_eventplot_legend():
+    plt.eventplot([1.0], label='Label')
+    plt.legend()
