Merge pull request #14695 from anntzer/simplifications

timhoffm · web-flow · commit 060d2992fe5c · 2019-07-17T20:23:12.000+02:00
Various small simplifications
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -2734,16 +2734,13 @@ def stem(self, *args, linefmt=None, markerfmt=None, basefmt=None, bottom=0,
             raise TypeError('stem expected between 1 and 5 positional '
                             'arguments, got {}'.format(args))
 
-        y = np.asarray(args[0])
-        args = args[1:]
-
-        # Try a second one
-        if not args:
+        if len(args) == 1:
+            y, = args
             x = np.arange(len(y))
+            args = ()
         else:
-            x = y
-            y = np.asarray(args[0], dtype=float)
-            args = args[1:]
+            x, y, *args = args
+
         self._process_unit_info(xdata=x, ydata=y)
         x = self.convert_xunits(x)
         y = self.convert_yunits(y)
@@ -5056,6 +5053,7 @@ def fill(self, *args, data=None, **kwargs):
         """
         # For compatibility(!), get aliases from Line2D rather than Patch.
         kwargs = cbook.normalize_kwargs(kwargs, mlines.Line2D)
+        # _get_patches_for_fill returns a generator, convert it to a list.
         patches = [*self._get_patches_for_fill(*args, data=data, **kwargs)]
         for poly in patches:
             self.add_patch(poly)
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -1265,8 +1265,8 @@ def set_aspect(self, aspect, adjustable=None, anchor=None, share=False):
                 'on 3D axes')
 
         if share:
-            axes = set(self._shared_x_axes.get_siblings(self)
-                       + self._shared_y_axes.get_siblings(self))
+            axes = {*self._shared_x_axes.get_siblings(self),
+                    *self._shared_y_axes.get_siblings(self)}
         else:
             axes = [self]
 
@@ -1317,8 +1317,8 @@ def set_adjustable(self, adjustable, share=False):
         """
         cbook._check_in_list(["box", "datalim"], adjustable=adjustable)
         if share:
-            axes = set(self._shared_x_axes.get_siblings(self)
-                       + self._shared_y_axes.get_siblings(self))
+            axes = {*self._shared_x_axes.get_siblings(self),
+                    *self._shared_y_axes.get_siblings(self)}
         else:
             axes = [self]
         for ax in axes:
@@ -1385,8 +1385,8 @@ def set_anchor(self, anchor, share=False):
             raise ValueError('argument must be among %s' %
                              ', '.join(mtransforms.Bbox.coefs))
         if share:
-            axes = set(self._shared_x_axes.get_siblings(self)
-                       + self._shared_y_axes.get_siblings(self))
+            axes = {*self._shared_x_axes.get_siblings(self),
+                    *self._shared_y_axes.get_siblings(self)}
         else:
             axes = [self]
         for ax in axes:
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -849,11 +849,7 @@ def _print_ps(self, outfile, format, *args,
         if papertype is None:
             papertype = rcParams['ps.papersize']
         papertype = papertype.lower()
-        if papertype == 'auto':
-            pass
-        elif papertype not in papersize:
-            raise RuntimeError('%s is not a valid papertype. Use one of %s' %
-                               (papertype, ', '.join(papersize)))
+        cbook._check_in_list(['auto', *papersize], papertype=papertype)
 
         orientation = orientation.lower()
         cbook._check_in_list(['landscape', 'portrait'],
diff --git a/lib/matplotlib/projections/polar.py b/lib/matplotlib/projections/polar.py
@@ -136,23 +136,19 @@ def __str__(self):
 
     def transform_non_affine(self, xy):
         # docstring inherited
-        x = xy[:, 0:1]
-        y = xy[:, 1:]
+        x, y = xy.T
         r = np.hypot(x, y)
         theta = (np.arctan2(y, x) + 2 * np.pi) % (2 * np.pi)
-
         # PolarAxes does not use the theta transforms here, but apply them for
         # backwards-compatibility if not being used by it.
         if self._apply_theta_transforms and self._axis is not None:
             theta -= self._axis.get_theta_offset()
             theta *= self._axis.get_theta_direction()
             theta %= 2 * np.pi
-
         if self._use_rmin and self._axis is not None:
             r += self._axis.get_rorigin()
             r *= self._axis.get_rsign()
-
-        return np.concatenate((theta, r), 1)
+        return np.column_stack([theta, r])
 
     def inverted(self):
         # docstring inherited
diff --git a/lib/matplotlib/tests/test_backend_cairo.py b/lib/matplotlib/tests/test_backend_cairo.py
@@ -3,7 +3,6 @@
 import os
 import tempfile
 import warnings
-import xml.parsers.expat
 
 import pytest
 
diff --git a/lib/matplotlib/tri/triangulation.py b/lib/matplotlib/tri/triangulation.py
@@ -134,12 +134,9 @@ def get_from_args_and_kwargs(*args, **kwargs):
         the possible args and kwargs.
         """
         if isinstance(args[0], Triangulation):
-            triangulation = args[0]
-            args = args[1:]
+            triangulation, *args = args
         else:
-            x = args[0]
-            y = args[1]
-            args = args[2:]  # Consumed first two args.
+            x, y, *args = args
 
             # Check triangles in kwargs then args.
             triangles = kwargs.pop('triangles', None)
diff --git a/lib/mpl_toolkits/mplot3d/axes3d.py b/lib/mpl_toolkits/mplot3d/axes3d.py
@@ -1512,8 +1512,7 @@ def plot(self, xs, ys, *args, zdir='z', **kwargs):
         # args[0] is a string matches the behavior of 2D `plot` (via
         # `_process_plot_var_args`).
         if args and not isinstance(args[0], str):
-            zs = args[0]
-            args = args[1:]
+            zs, *args = args
             if 'zs' in kwargs:
                 raise TypeError("plot() for multiple values for argument 'z'")
         else:
@@ -1971,12 +1970,12 @@ def plot_trisurf(self, *args, color=None, norm=None, vmin=None, vmax=None,
 
         tri, args, kwargs = \
             Triangulation.get_from_args_and_kwargs(*args, **kwargs)
-        if 'Z' in kwargs:
-            z = np.asarray(kwargs.pop('Z'))
-        else:
-            z = np.asarray(args[0])
+        try:
+            z = kwargs.pop('Z')
+        except KeyError:
             # We do this so Z doesn't get passed as an arg to PolyCollection
-            args = args[1:]
+            z, *args = args
+        z = np.asarray(z)
 
         triangles = tri.get_masked_triangles()
         xt = tri.x[triangles]
@@ -2154,9 +2153,8 @@ def tricontour(self, *args,
         if 'Z' in kwargs:
             Z = kwargs.pop('Z')
         else:
-            Z = args[0]
             # We do this so Z doesn't get passed as an arg to Axes.tricontour
-            args = args[1:]
+            Z, *args = args
 
         jX, jY, jZ = art3d.rotate_axes(X, Y, Z, zdir)
         tri = Triangulation(jX, jY, tri.triangles, tri.mask)
@@ -2244,9 +2242,8 @@ def tricontourf(self, *args, zdir='z', offset=None, **kwargs):
         if 'Z' in kwargs:
             Z = kwargs.pop('Z')
         else:
-            Z = args[0]
             # We do this so Z doesn't get passed as an arg to Axes.tricontourf
-            args = args[1:]
+            Z, *args = args
 
         jX, jY, jZ = art3d.rotate_axes(X, Y, Z, zdir)
         tri = Triangulation(jX, jY, tri.triangles, tri.mask)
