Merge pull request #3729 from alimuldal/fix_eventplot_colors_arg

tacaswell · tacaswell · commit d684890a774d · 2014-10-28T12:55:12.000-04:00
BUG : handling of color=None by eventplot(), fixes #3728
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1181,8 +1181,8 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
         if len(linewidths) == 1:
             linewidths = np.tile(linewidths, len(positions))
         if len(colors) == 1:
-            colors = np.asanyarray(colors)
-            colors = np.tile(colors, [len(positions), 1])
+            colors = list(colors)
+            colors = colors * len(positions)
         if len(linestyles) == 1:
             linestyles = [linestyles] * len(positions)
 
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/test_eventplot_defaults.png b/lib/matplotlib/tests/baseline_images/test_axes/test_eventplot_defaults.png
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -2197,6 +2197,23 @@ def test_eventplot():
     np.testing.assert_equal(num_collections, num_datasets)
 
 
+@image_comparison(baseline_images=['test_eventplot_defaults'], extensions=['png'], remove_text=True)
+def test_eventplot_defaults():
+    '''
+    test that eventplot produces the correct output given the default params
+    (see bug #3728)
+    '''
+    np.random.seed(0)
+
+    data1 = np.random.random([32, 20]).tolist()
+    data2 = np.random.random([6, 20]).tolist()
+    data = data1 + data2
+
+    fig = plt.figure()
+    axobj = fig.add_subplot(111)
+    colls = axobj.eventplot(data)
+
+
 @cleanup
 def test_empty_eventplot():
     fig, ax = plt.subplots(1, 1)
