Merge pull request #9952 from as691454/my-branch

jklymak · web-flow · commit 407a4609f87b · 2018-01-20T13:38:16.000-08:00
Errorbars accept marker_options and follow prop_cycle
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3058,7 +3058,10 @@ def errorbar(self, x, y, yerr=None, xerr=None,
         plot_line = (fmt.lower() != 'none')
         label = kwargs.pop("label", None)
 
-        fmt_style_kwargs = {k: v for k, v in
+        if fmt == '':
+            fmt_style_kwargs = {}
+        else:
+            fmt_style_kwargs = {k: v for k, v in
                             zip(('linestyle', 'marker', 'color'),
                                 _process_plot_format(fmt)) if v is not None}
         if fmt == 'none':
@@ -3122,6 +3125,9 @@ def errorbar(self, x, y, yerr=None, xerr=None,
         eb_cap_style = dict(base_style)
         # eject any marker information from format string
         eb_cap_style.pop('marker', None)
+        eb_lines_style.pop('markerfacecolor', None)
+        eb_lines_style.pop('markeredgewidth', None)
+        eb_lines_style.pop('markeredgecolor', None)
         eb_cap_style.pop('ls', None)
         eb_cap_style['linestyle'] = 'none'
         if capsize is None:
diff --git a/lib/matplotlib/tests/baseline_images/test_axes/errorbar_with_prop_cycle.png b/lib/matplotlib/tests/baseline_images/test_axes/errorbar_with_prop_cycle.png
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -2817,6 +2817,16 @@ def test_errobar_nonefmt():
         assert np.all(errbar.get_color() == mcolors.to_rgba('C0'))
 
 
+@image_comparison(baseline_images=['errorbar_with_prop_cycle'],
+                  extensions=['png'], style='mpl20', remove_text=True)
+def test_errorbar_with_prop_cycle():
+    _cycle = cycler(ls=['--', ':'], marker=['s', 's'], mfc=['k', 'w'])
+    plt.rc("axes", prop_cycle=_cycle)
+    fig, ax = plt.subplots()
+    ax.errorbar(x=[2, 4, 10], y=[3, 2, 4], yerr=0.5)
+    ax.errorbar(x=[2, 4, 10], y=[6, 4, 2], yerr=0.5)
+
+
 @image_comparison(baseline_images=['hist_stacked_stepfilled',
                                    'hist_stacked_stepfilled'])
 def test_hist_stacked_stepfilled():
