Small cleanups. (#13136)

anntzer · timhoffm · commit 09227905fb2c · 2019-01-10T09:26:34.000+01:00
((mostly (extra) parentheses)).
diff --git a/examples/color/named_colors.py b/examples/color/named_colors.py
@@ -27,11 +27,13 @@ def plot_colortable(colors, title, sort_colors=True, emptycols=0):
     topmargin = 40
 
     # Sort colors by hue, saturation, value and name.
-    by_hsv = ((tuple(mcolors.rgb_to_hsv(mcolors.to_rgba(color)[:3])), name)
-                    for name, color in colors.items())
     if sort_colors is True:
-        by_hsv = sorted(by_hsv)
-    names = [name for hsv, name in by_hsv]
+        by_hsv = sorted((tuple(mcolors.rgb_to_hsv(mcolors.to_rgb(color))),
+                         name)
+                        for name, color in colors.items())
+        names = [name for hsv, name in by_hsv]
+    else:
+        names = list(colors)
 
     n = len(names)
     ncols = 4 - emptycols
diff --git a/examples/images_contours_and_fields/tricontour_demo.py b/examples/images_contours_and_fields/tricontour_demo.py
@@ -75,7 +75,7 @@
 y = np.degrees(xy[:, 1])
 x0 = -5
 y0 = 52
-z = np.exp(-0.01 * ((x - x0) * (x - x0) + (y - y0) * (y - y0)))
+z = np.exp(-0.01 * ((x - x0) ** 2 + (y - y0) ** 2))
 
 triangles = np.asarray([
     [67, 66,  1], [65,  2, 66], [ 1, 66,  2], [64,  2, 65], [63,  3, 64],
diff --git a/examples/text_labels_and_annotations/legend_demo.py b/examples/text_labels_and_annotations/legend_demo.py
@@ -133,7 +133,7 @@ def create_artists(self, legend, orig_handle,
         leglines = []
         # divide the vertical space where the lines will go
         # into equal parts based on the number of lines
-        ydata = ((height) / (numlines + 1)) * np.ones(xdata.shape, float)
+        ydata = np.full_like(xdata, height / (numlines + 1))
         # for each line, create the line at the proper location
         # and set the dash pattern
         for i in range(numlines):
diff --git a/lib/matplotlib/_layoutbox.py b/lib/matplotlib/_layoutbox.py
@@ -234,7 +234,7 @@ def constrain_geometry(self, left, bottom, right, top, strength='strong'):
               self.bottom == bottom,
               self.top == top]
         for c in hc:
-            self.solver.addConstraint((c | strength))
+            self.solver.addConstraint(c | strength)
         # self.solver.updateVariables()
 
     def constrain_same(self, other, strength='strong'):
@@ -246,7 +246,7 @@ def constrain_same(self, other, strength='strong'):
               self.bottom == other.bottom,
               self.top == other.top]
         for c in hc:
-            self.solver.addConstraint((c | strength))
+            self.solver.addConstraint(c | strength)
 
     def constrain_left_margin(self, margin, strength='strong'):
         c = (self.left == self.parent.left + margin)
@@ -467,7 +467,7 @@ def layout_from_subplotspec(self, subspec,
               self.width == parent.width * width,
               self.height == parent.height * height]
         for c in cs:
-            self.solver.addConstraint((c | 'required'))
+            self.solver.addConstraint(c | 'required')
 
         return lb
 
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -1641,18 +1641,15 @@ def shade(self, data, cmap, norm=None, blend_mode='overlay', vmin=None,
     def shade_rgb(self, rgb, elevation, fraction=1., blend_mode='hsv',
                   vert_exag=1, dx=1, dy=1, **kwargs):
         """
-        Take the input RGB array (ny*nx*3) adjust their color values
-        to given the impression of a shaded relief map with a
-        specified light source using the elevation (ny*nx).
-        A new RGB array ((ny*nx*3)) is returned.
+        Use this light source to adjust the colors of the *rgb* input array to
+        give the impression of a shaded relief map with the given `elevation`.
 
         Parameters
         ----------
         rgb : array-like
-            An MxNx3 RGB array, assumed to be in the range of 0 to 1.
+            An (M, N, 3) RGB array, assumed to be in the range of 0 to 1.
         elevation : array-like
-            A 2d array (or equivalent) of the height values used to generate a
-            shaded map.
+            An (M, N) array of the height values used to generate a shaded map.
         fraction : number
             Increases or decreases the contrast of the hillshade.  Values
             greater than one will cause intermediate values to move closer to
@@ -1684,7 +1681,7 @@ def shade_rgb(self, rgb, elevation, fraction=1., blend_mode='hsv',
         Returns
         -------
         shaded_rgb : ndarray
-            An MxNx3 array of floats ranging between 0-1.
+            An (m, n, 3) array of floats ranging between 0-1.
         """
         # Calculate the "hillshade" intensity.
         intensity = self.hillshade(elevation, vert_exag, dx, dy, fraction)
diff --git a/lib/matplotlib/figure.py b/lib/matplotlib/figure.py
@@ -584,7 +584,7 @@ def get_constrained_layout_pads(self, relative=False):
         wspace = self._constrained_layout_pads['wspace']
         hspace = self._constrained_layout_pads['hspace']
 
-        if relative and ((w_pad is not None) or (h_pad is not None)):
+        if relative and (w_pad is not None or h_pad is not None):
             renderer0 = layoutbox.get_renderer(self)
             dpi = renderer0.dpi
             w_pad = w_pad * dpi / renderer0.width
diff --git a/lib/matplotlib/streamplot.py b/lib/matplotlib/streamplot.py
@@ -272,8 +272,8 @@ def __init__(self, grid, mask):
 
     def grid2mask(self, xi, yi):
         """Return nearest space in mask-coords from given grid-coords."""
-        return (int((xi * self.x_grid2mask) + 0.5),
-                int((yi * self.y_grid2mask) + 0.5))
+        return (int(xi * self.x_grid2mask + 0.5),
+                int(yi * self.y_grid2mask + 0.5))
 
     def mask2grid(self, xm, ym):
         return xm * self.x_mask2grid, ym * self.y_mask2grid
diff --git a/lib/matplotlib/tests/test_colorbar.py b/lib/matplotlib/tests/test_colorbar.py
@@ -397,7 +397,7 @@ def test_colorbar_axes_kw():
     # test fix for #8493: This does only test, that axes-related keywords pass
     # and do not raise an exception.
     plt.figure()
-    plt.imshow(([[1, 2], [3, 4]]))
+    plt.imshow([[1, 2], [3, 4]])
     plt.colorbar(orientation='horizontal', fraction=0.2, pad=0.2, shrink=0.5,
                  aspect=10, anchor=(0., 0.), panchor=(0., 1.))
 
diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py
@@ -296,7 +296,7 @@ def test_contains_branch(self):
         assert r1.contains_branch(r2)
         assert r1.contains_branch(self.ta1)
         assert not r1.contains_branch(self.ta2)
-        assert not r1.contains_branch((self.ta2 + self.ta2))
+        assert not r1.contains_branch(self.ta2 + self.ta2)
 
         assert r1 == r2
 
@@ -309,10 +309,10 @@ def test_contains_branch(self):
         assert not self.stack2_subset.contains_branch(self.stack1)
         assert not self.stack2_subset.contains_branch(self.stack2)
 
-        assert self.stack1.contains_branch((self.ta2 + self.ta3))
-        assert self.stack2.contains_branch((self.ta2 + self.ta3))
+        assert self.stack1.contains_branch(self.ta2 + self.ta3)
+        assert self.stack2.contains_branch(self.ta2 + self.ta3)
 
-        assert not self.stack1.contains_branch((self.tn1 + self.ta2))
+        assert not self.stack1.contains_branch(self.tn1 + self.ta2)
 
     def test_affine_simplification(self):
         # tests that a transform stack only calls as much is absolutely
diff --git a/lib/matplotlib/tests/test_triangulation.py b/lib/matplotlib/tests/test_triangulation.py
@@ -56,15 +56,13 @@ def test_delaunay():
 
 
 def test_delaunay_duplicate_points():
-    # x[duplicate] == x[duplicate_of]
-    # y[duplicate] == y[duplicate_of]
     npoints = 10
     duplicate = 7
     duplicate_of = 3
 
     np.random.seed(23)
-    x = np.random.random((npoints))
-    y = np.random.random((npoints))
+    x = np.random.random(npoints)
+    y = np.random.random(npoints)
     x[duplicate] = x[duplicate_of]
     y[duplicate] = y[duplicate_of]
 
diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py
@@ -1034,12 +1034,9 @@ def _get_tick_info(self, tick_iter):
 
         for loc, angle_normal, angle_tangent, label in tick_iter:
             angle_label = angle_tangent - 90 + ticklabel_add_angle
-
-            if np.cos((angle_label - angle_normal)/180.*np.pi) < 0.:
-                angle_tick = angle_normal
-            else:
-                angle_tick = angle_normal + 180
-
+            angle_tick = (angle_normal
+                          if 90 <= (angle_label - angle_normal) % 360 <= 270
+                          else angle_normal + 180)
             ticks_loc_angle.append([loc, angle_tick])
             ticklabels_loc_angle_label.append([loc, angle_label, label])
 
diff --git a/tutorials/introductory/customizing.py b/tutorials/introductory/customizing.py
@@ -86,7 +86,7 @@
 # for limiting your changes to a specific scope. To isolate your styling
 # changes, you can write something like the following:
 
-with plt.style.context(('dark_background')):
+with plt.style.context('dark_background'):
     plt.plot(np.sin(np.linspace(0, 2 * np.pi)), 'r-o')
 plt.show()
 
