Merge pull request #7718 from NelleV/patch_that_doesnt_apply_cleanly

NelleV · web-flow · commit 3475a843f1b2 · 2017-01-01T08:54:03.000+01:00
Merged 158f36e
diff --git a/lib/matplotlib/legend_handler.py b/lib/matplotlib/legend_handler.py
@@ -265,7 +265,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
@@ -4820,6 +4820,12 @@ def test_scatter_color_masking():
     assert linewidths[1] == 3
 
 
+@cleanup
+def test_eventplot_legend():
+    plt.eventplot([1.0], label='Label')
+    plt.legend()
+
+
 if __name__ == '__main__':
     import nose
     import sys
