Merge pull request #15858 from anntzer/1tuple

tacaswell · web-flow · commit cf6c569e61fd · 2019-12-08T15:36:55.000-05:00
MNT: Avoid some uses of len-1 tuples.
diff --git a/lib/matplotlib/backends/backend_ps.py b/lib/matplotlib/backends/backend_ps.py
@@ -684,14 +684,11 @@ def draw_gouraud_triangles(self, gc, points, colors, trans):
         xmax, ymax = points_max
 
         streamarr = np.empty(
-            (shape[0] * shape[1],),
-            dtype=[('flags', 'u1'),
-                   ('points', '>u4', (2,)),
-                   ('colors', 'u1', (3,))])
+            shape[0] * shape[1],
+            dtype=[('flags', 'u1'), ('points', '2>u4'), ('colors', '3u1')])
         streamarr['flags'] = 0
         streamarr['points'] = (flat_points - points_min) * factor
         streamarr['colors'] = flat_colors[:, :3] * 255.0
-
         stream = quote_ps_string(streamarr.tostring())
 
         self._pswriter.write(f"""\
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -91,8 +91,8 @@ def _get_packed_offsets(wd_list, total, sep, mode="fixed"):
     offsets : array of float
         The left offsets of the boxes.
     """
-    w_list, d_list = zip(*wd_list)
-    # d_list is currently not used.
+    w_list, d_list = zip(*wd_list)  # d_list is currently not used.
+    cbook._check_in_list(["fixed", "expand", "equal"], mode=mode)
 
     if mode == "fixed":
         offsets_ = np.cumsum([0] + [w + sep for w in w_list])
@@ -119,16 +119,13 @@ def _get_packed_offsets(wd_list, total, sep, mode="fixed"):
         if total is None:
             if sep is None:
                 raise ValueError("total and sep cannot both be None when "
-                                 "using layout mode 'equal'.")
+                                 "using layout mode 'equal'")
             total = (maxh + sep) * len(w_list)
         else:
             sep = total / len(w_list) - maxh
         offsets = (maxh + sep) * np.arange(len(w_list))
         return total, offsets
 
-    else:
-        raise ValueError("Unknown mode : %s" % (mode,))
-
 
 def _get_aligned_offsets(hd_list, height, align="baseline"):
     """
@@ -146,6 +143,8 @@ def _get_aligned_offsets(hd_list, height, align="baseline"):
 
     if height is None:
         height = max(h for h, d in hd_list)
+    cbook._check_in_list(
+        ["baseline", "left", "top", "right", "bottom", "center"], align=align)
 
     if align == "baseline":
         height_descent = max(h - d for h, d in hd_list)
@@ -161,8 +160,6 @@ def _get_aligned_offsets(hd_list, height, align="baseline"):
     elif align == "center":
         descent = 0.
         offsets = [(height - h) * .5 + d for h, d in hd_list]
-    else:
-        raise ValueError("Unknown Align mode : %s" % (align,))
 
     return height, descent, offsets
 
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -3864,14 +3864,11 @@ class FancyArrowPatch(Patch):
     _edge_default = True
 
     def __str__(self):
-
         if self._posA_posB is not None:
             (x1, y1), (x2, y2) = self._posA_posB
-            return self.__class__.__name__ \
-                + "((%g, %g)->(%g, %g))" % (x1, y1, x2, y2)
+            return f"{type(self).__name__}(({x1:g}, {y1:g})->({x2:g}, {y2:g}))"
         else:
-            return self.__class__.__name__ \
-                + "(%s)" % (str(self._path_original),)
+            return f"{type(self).__name__}({self._path_original})"
 
     @docstring.dedent_interpd
     def __init__(self, posA=None, posB=None,
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -688,8 +688,8 @@ def unit_regular_star(cls, numVertices, innerCircle=0.5):
             theta += np.pi / 2.0
             r = np.ones(ns2 + 1)
             r[1::2] = innerCircle
-            verts = np.vstack((r*np.cos(theta), r*np.sin(theta))).transpose()
-            codes = np.empty((ns2 + 1,))
+            verts = (r * np.vstack((np.cos(theta), np.sin(theta)))).T
+            codes = np.empty(ns2 + 1)
             codes[0] = cls.MOVETO
             codes[1:-1] = cls.LINETO
             codes[-1] = cls.CLOSEPOLY
