Make errorbar's main Line2D closer to plot.

QuLogic · QuLogic · commit a953914889c5 · 2020-08-18T20:02:37.000-04:00
We can't directly use `self.plot` or `self._get_lines` because they
would do `self._process_unit_info` and/or *data* keyword argument
processing.
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -3334,39 +3334,35 @@ def errorbar(self, x, y, yerr=None, xerr=None,
             if not np.iterable(yerr):
                 yerr = [yerr] * len(y)
 
-        plot_line = (fmt.lower() != 'none')
         label = kwargs.pop("label", None)
+        kwargs['label'] = '_nolegend_'
+
+        # Create the main line and determine overall kwargs for child artists.
+        # We avoid calling self.plot() directly, or self._get_lines(), because
+        # that would call self._process_unit_info again, and do other indirect
+        # data processing.
+        (data_line, base_style), = self._get_lines._plot_args(
+            (x, y) if fmt == '' else (x, y, fmt), kwargs, return_kwargs=True)
+
+        # Do this after creating `data_line` to avoid modifying `base_style`.
+        if barsabove:
+            data_line.set_zorder(kwargs['zorder'] - .1)
+        else:
+            data_line.set_zorder(kwargs['zorder'] + .1)
 
-        if fmt == '':
-            fmt_style_kwargs = {}
+        # Add line to plot, or throw it away and use it to determine kwargs.
+        if fmt.lower() != 'none':
+            self.add_line(data_line)
         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':
-            # Remove alpha=0 color that _process_plot_format returns
-            fmt_style_kwargs.pop('color')
-
-        base_style = self._get_lines._getdefaults(
-            set(), {**fmt_style_kwargs, **kwargs})
-        if 'color' in kwargs:
-            base_style['color'] = kwargs.pop('color')
-        base_style['label'] = '_nolegend_'
-        base_style.update(fmt_style_kwargs)
+            data_line = None
+            # Remove alpha=0 color that _process_plot_format returns.
+            base_style.pop('color')
+
         if 'color' not in base_style:
             base_style['color'] = 'C0'
         if ecolor is None:
             ecolor = base_style['color']
 
-        # make the style dict for the 'normal' plot line
-        plot_line_style = {
-            **base_style,
-            **kwargs,
-            'zorder': (kwargs['zorder'] - .1 if barsabove else
-                       kwargs['zorder'] + .1),
-        }
-
         # Make the style dict for the line collections (the bars), ejecting any
         # marker information from format string.
         eb_lines_style = dict(base_style)
@@ -3411,11 +3407,6 @@ def errorbar(self, x, y, yerr=None, xerr=None,
                 eb_cap_style[key] = kwargs[key]
         eb_cap_style['color'] = ecolor
 
-        data_line = None
-        if plot_line:
-            data_line = mlines.Line2D(x, y, **plot_line_style)
-            self.add_line(data_line)
-
         barcols = []
         caplines = []
 
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -3026,6 +3026,9 @@ def errorbar(self, x, y, z, zerr=None, yerr=None, xerr=None, fmt='',
         """
         had_data = self.has_data()
 
+        if 'zorder' not in kwargs:
+            kwargs['zorder'] = 2
+
         try:
             offset, errorevery = errorevery
         except TypeError:
@@ -3046,42 +3049,36 @@ def errorbar(self, x, y, z, zerr=None, yerr=None, xerr=None, fmt='',
         if not len(x) == len(y) == len(z):
             raise ValueError("'x', 'y', and 'z' must have the same size")
 
-        plot_line = (fmt.lower() != 'none')
         label = kwargs.pop("label", None)
+        kwargs['label'] = '_nolegend_'
+
+        # Create the main line and determine overall kwargs for child artists.
+        # We avoid calling self.plot() directly, or self._get_lines(), because
+        # that would call self._process_unit_info again, and do other indirect
+        # data processing.
+        (data_line, base_style), = self._get_lines._plot_args(
+            (x, y) if fmt == '' else (x, y, fmt), kwargs, return_kwargs=True)
+        art3d.line_2d_to_3d(data_line, zs=z)
+
+        # Do this after creating `data_line` to avoid modifying `base_style`.
+        if barsabove:
+            data_line.set_zorder(kwargs['zorder'] - .1)
+        else:
+            data_line.set_zorder(kwargs['zorder'] + .1)
 
-        if fmt == '':
-            fmt_style_kwargs = {}
+        # Add line to plot, or throw it away and use it to determine kwargs.
+        if fmt.lower() != 'none':
+            self.add_line(data_line)
         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':
-            # Remove alpha=0 color that _process_plot_format returns
-            fmt_style_kwargs.pop('color')
-
-        base_style = self._get_lines._getdefaults(
-            set(), {**fmt_style_kwargs, **kwargs})
-        if 'color' in kwargs:
-            base_style['color'] = kwargs.pop('color')
-        base_style['label'] = '_nolegend_'
-        base_style.update(fmt_style_kwargs)
+            data_line = None
+            # Remove alpha=0 color that _process_plot_format returns.
+            base_style.pop('color')
+
         if 'color' not in base_style:
             base_style['color'] = 'C0'
         if ecolor is None:
             ecolor = base_style['color']
 
-        # make the style dict for the 'normal' plot line
-        if 'zorder' not in kwargs:
-            kwargs['zorder'] = 2
-        plot_line_style = {
-            **base_style,
-            **kwargs,
-            'zorder': (kwargs['zorder'] - .1 if barsabove else
-                       kwargs['zorder'] + .1),
-        }
-
         # Make the style dict for the line collections (the bars), ejecting any
         # marker information from format string.
         eb_lines_style = dict(base_style)
