Re-group errorbar styling dictionaries.

QuLogic · QuLogic · commit 8eea274673c0 · 2020-07-18T01:27:11.000-04:00
The lines and caps dictionary modifications are intermixed, making them
a bit confusing. Also do the same marker style removal from the cap
style, which would normally be replaced later.
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3314,9 +3314,15 @@ def errorbar(self, x, y, yerr=None, xerr=None,
                        kwargs['zorder'] + .1),
         }
 
-        # make the style dict for the line collections (the bars)
+        # Make the style dict for the line collections (the bars), ejecting any
+        # marker information from format string.
         eb_lines_style = dict(base_style)
         eb_lines_style.pop('marker', None)
+        eb_lines_style.pop('markersize', None)
+        eb_lines_style.pop('markerfacecolor', None)
+        eb_lines_style.pop('markeredgewidth', None)
+        eb_lines_style.pop('markeredgecolor', None)
+        eb_lines_style.pop('ls', None)
         eb_lines_style.pop('linestyle', None)
         eb_lines_style['color'] = ecolor
 
@@ -3329,13 +3335,14 @@ def errorbar(self, x, y, yerr=None, xerr=None,
             if key in kwargs:
                 eb_lines_style[key] = kwargs[key]
 
-        # set up cap style dictionary
+        # Make the style dict for the caps, ejecting any marker information
+        # from format string.
         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('markersize', None)
+        eb_cap_style.pop('markerfacecolor', None)
+        eb_cap_style.pop('markeredgewidth', None)
+        eb_cap_style.pop('markeredgecolor', None)
         eb_cap_style.pop('ls', None)
         eb_cap_style['linestyle'] = 'none'
         if capsize is None:
