Inline _grab_next_args.

anntzer · anntzer · commit 9595a7d10f2e · 2018-03-30T19:34:16.000-07:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1108,7 +1108,8 @@ def eventplot(self, positions, orientation='horizontal', lineoffsets=1,
 
         return colls
 
-    # ### Basic plotting
+    #### Basic plotting
+
     # The label_naming happens in `matplotlib.axes._base._plot_args`
     @_preprocess_data(replace_names=["x", "y"],
                       positional_parameter_names=_plot_args_replacer,
@@ -1343,13 +1344,11 @@ def plot(self, *args, **kwargs):
         """
         scalex = kwargs.pop('scalex', True)
         scaley = kwargs.pop('scaley', True)
-        lines = []
-
         kwargs = cbook.normalize_kwargs(kwargs, mlines.Line2D._alias_map)
 
-        for line in self._get_lines(*args, **kwargs):
+        lines = [*self._get_lines(*args, **kwargs)]
+        for line in lines:
             self.add_line(line)
-            lines.append(line)
 
         self.autoscale_view(scalex=scalex, scaley=scaley)
         return lines
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -165,23 +165,23 @@ def set_prop_cycle(self, *args, **kwargs):
     def __call__(self, *args, **kwargs):
         if self.axes.xaxis is not None and self.axes.yaxis is not None:
             xunits = kwargs.pop('xunits', self.axes.xaxis.units)
-
             if self.axes.name == 'polar':
                 xunits = kwargs.pop('thetaunits', xunits)
+            if xunits != self.axes.xaxis.units:
+                self.axes.xaxis.set_units(xunits)
 
             yunits = kwargs.pop('yunits', self.axes.yaxis.units)
-
             if self.axes.name == 'polar':
                 yunits = kwargs.pop('runits', yunits)
-
-            if xunits != self.axes.xaxis.units:
-                self.axes.xaxis.set_units(xunits)
-
             if yunits != self.axes.yaxis.units:
                 self.axes.yaxis.set_units(yunits)
 
-        ret = self._grab_next_args(*args, **kwargs)
-        return ret
+        while args:
+            this, args = args[:2], args[2:]
+            if args and isinstance(args[0], str):
+                this += args[0],
+                args = args[1:]
+            yield from self._plot_args(this, kwargs)
 
     def get_next_color(self):
         """Return the next color in the cycle."""
@@ -382,14 +382,6 @@ def _plot_args(self, tup, kwargs):
             ret.append(seg)
         return ret
 
-    def _grab_next_args(self, *args, **kwargs):
-        while args:
-            this, args = args[:2], args[2:]
-            if args and isinstance(args[0], str):
-                this += args[0],
-                args = args[1:]
-            yield from self._plot_args(this, kwargs)
-
 
 class _AxesBase(martist.Artist):
     """
