Restructure _process_plot_varargs

timhoffm · tacaswell · commit ca2ecb20d2cf · 2024-10-24T15:46:50.000-04:00
Distinguish variants by desired output instead of calling command.
This gives a better terminology for the new coordinate output variant.

The command input was also used to create an error message containing the
calling function name. This has been replaced by introspection.
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -213,9 +213,9 @@ class _process_plot_var_args:
     an arbitrary number of *x*, *y*, *fmt* are allowed
     """
 
-    def __init__(self, command='plot'):
-        _api.check_in_list(['plot', 'fill', 'mirror'], command=command)
-        self.command = command
+    def __init__(self, output='Line2D'):
+        _api.check_in_list(['Line2D', 'Polygon', 'coordinates'], output=output)
+        self.output = output
         self.set_prop_cycle(None)
 
     def set_prop_cycle(self, cycler):
@@ -229,7 +229,7 @@ def __call__(self, axes, *args, data=None, return_kwargs=False, **kwargs):
 
         for pos_only in "xy":
             if pos_only in kwargs:
-                raise _api.kwarg_error(self.command, pos_only)
+                raise _api.kwarg_error(inspect.stack()[1].function, pos_only)
 
         if not args:
             return
@@ -332,18 +332,18 @@ def _setdefaults(self, defaults, kw):
             if kw.get(k, None) is None:
                 kw[k] = defaults[k]
 
-    def _makeline(self, axes, x, y, kw, kwargs):
+    def _make_line(self, axes, x, y, kw, kwargs):
         kw = {**kw, **kwargs}  # Don't modify the original kw.
         self._setdefaults(self._getdefaults(kw), kw)
         seg = mlines.Line2D(x, y, **kw)
         return seg, kw
 
-    def _mirror(self, axes, x, y, kw, kwargs):
+    def _make_coordinates(self, axes, x, y, kw, kwargs):
         kw = {**kw, **kwargs}  # Don't modify the original kw.
         self._setdefaults(self._getdefaults(kw), kw)
         return (x, y), kw
 
-    def _makefill(self, axes, x, y, kw, kwargs):
+    def _make_polygon(self, axes, x, y, kw, kwargs):
         # Polygon doesn't directly support unitized inputs.
         x = axes.convert_xunits(x)
         y = axes.convert_yunits(y)
@@ -501,15 +501,15 @@ def _plot_args(self, axes, tup, kwargs, *,
         if y.ndim == 1:
             y = y[:, np.newaxis]
 
-        if self.command == 'plot':
-            make_artist = self._makeline
-        elif self.command == 'fill':
+        if self.output == 'Line2D':
+            make_artist = self._make_line
+        elif self.output == 'Polygon':
             kw['closed'] = kwargs.get('closed', True)
-            make_artist = self._makefill
-        elif self.command == 'mirror':
-            make_artist = self._mirror
+            make_artist = self._make_polygon
+        elif self.output == 'coordinates':
+            make_artist = self._make_coordinates
         else:
-            _api.check_in_list(['plot', 'fill', 'mirror'], command=self.command)
+            _api.check_in_list(['Line2D', 'Polygon', 'coordinates'], output=self.output)
 
         ncx, ncy = x.shape[1], y.shape[1]
         if ncx > 1 and ncy > 1 and ncx != ncy:
@@ -1311,7 +1311,7 @@ def __clear(self):
         self._use_sticky_edges = True
 
         self._get_lines = _process_plot_var_args()
-        self._get_patches_for_fill = _process_plot_var_args('fill')
+        self._get_patches_for_fill = _process_plot_var_args('Polygon')
 
         self._gridOn = mpl.rcParams['axes.grid']
         # Swap children to minimize time we spend in an invalid state
