Call min/max directly on generator or two args.

anntzer · anntzer · commit de302f55d15f · 2016-12-04T14:17:26.000-08:00
diff --git a/doc/utils/pylab_names.py b/doc/utils/pylab_names.py
@@ -46,16 +46,13 @@
 
     print()
     funcs, docs = zip(*modd[mod])
-    maxfunc = max([len(f) for f in funcs])
-    maxdoc = max(40, max([len(d) for d in docs]) )
-    border = ' '.join(['='*maxfunc, '='*maxdoc])
+    maxfunc = max(len(f) for f in funcs)
+    maxdoc = max(40, max(len(d) for d in docs))
+    border = '=' * maxfunc + ' ' + '=' * maxdoc
     print(border)
-    print(' '.join(['symbol'.ljust(maxfunc), 'description'.ljust(maxdoc)]))
+    print('{:<{}} {:<{}}'.format('symbol', maxfunc, 'description', maxdoc))
     print(border)
     for func, doc in modd[mod]:
-        row = ' '.join([func.ljust(maxfunc), doc.ljust(maxfunc)])
-        print(row)
-
+        print('{:<{}} {:<{}}'.format(func, maxfunc, doc, maxdoc))
     print(border)
     print()
-    #break
diff --git a/examples/axes_grid1/scatter_hist.py b/examples/axes_grid1/scatter_hist.py
@@ -30,7 +30,7 @@
 
 # now determine nice limits by hand:
 binwidth = 0.25
-xymax = np.max([np.max(np.fabs(x)), np.max(np.fabs(y))])
+xymax = max(np.max(np.abs(x)), np.max(np.abs(y)))
 lim = (int(xymax/binwidth) + 1)*binwidth
 
 bins = np.arange(-lim, lim + binwidth, binwidth)
diff --git a/examples/pylab_examples/scatter_hist.py b/examples/pylab_examples/scatter_hist.py
@@ -37,7 +37,7 @@
 
 # now determine nice limits by hand:
 binwidth = 0.25
-xymax = np.max([np.max(np.fabs(x)), np.max(np.fabs(y))])
+xymax = max(np.max(np.abs(x)), np.max(np.abs(y)))
 lim = (int(xymax/binwidth) + 1) * binwidth
 
 axScatter.set_xlim((-lim, lim))
diff --git a/examples/widgets/menu.py b/examples/widgets/menu.py
@@ -126,8 +126,8 @@ def __init__(self, fig, menuitems):
         self.menuitems = menuitems
         self.numitems = len(menuitems)
 
-        maxw = max([item.labelwidth for item in menuitems])
-        maxh = max([item.labelheight for item in menuitems])
+        maxw = max(item.labelwidth for item in menuitems)
+        maxh = max(item.labelheight for item in menuitems)
 
         totalh = self.numitems*maxh + (self.numitems + 1)*2*MenuItem.pady
 
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -1278,12 +1278,11 @@ def pprint_setters_rest(self, prop=None, leadingspace=2):
 
         ########
         names = [self.aliased_name_rest(prop, target)
-                 for prop, target
-                 in attrs]
+                 for prop, target in attrs]
         accepts = [self.get_valid_values(prop) for prop, target in attrs]
 
-        col0_len = max([len(n) for n in names])
-        col1_len = max([len(a) for a in accepts])
+        col0_len = max(len(n) for n in names)
+        col1_len = max(len(a) for a in accepts)
         table_formatstr = pad + '=' * col0_len + '   ' + '=' * col1_len
 
         lines.append('')
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -2162,17 +2162,17 @@ def make_iterable(x):
 
         if adjust_xlim:
             xmin, xmax = self.dataLim.intervalx
-            xmin = np.amin([w for w in width if w > 0])
+            xmin = np.min(w for w in width if w > 0)
             if xerr is not None:
-                xmin = xmin - np.amax(xerr)
+                xmin = xmin - np.max(xerr)
             xmin = max(xmin * 0.9, 1e-100)
             self.dataLim.intervalx = (xmin, xmax)
 
         if adjust_ylim:
             ymin, ymax = self.dataLim.intervaly
-            ymin = np.amin([h for h in height if h > 0])
+            ymin = np.min(h for h in height if h > 0)
             if yerr is not None:
-                ymin = ymin - np.amax(yerr)
+                ymin = ymin - np.max(yerr)
             ymin = max(ymin * 0.9, 1e-100)
             self.dataLim.intervaly = (ymin, ymax)
         self.autoscale_view()
diff --git a/lib/matplotlib/mathtext.py b/lib/matplotlib/mathtext.py
@@ -3183,8 +3183,8 @@ def overline(self, s, loc, toks):
     def _auto_sized_delimiter(self, front, middle, back):
         state = self.get_state()
         if len(middle):
-            height = max([x.height for x in middle])
-            depth = max([x.depth for x in middle])
+            height = max(x.height for x in middle)
+            depth = max(x.depth for x in middle)
             factor = None
         else:
             height = 0
diff --git a/lib/matplotlib/offsetbox.py b/lib/matplotlib/offsetbox.py
@@ -119,11 +119,11 @@ def _get_aligned_offsets(hd_list, height, align="baseline"):
     """
 
     if height is None:
-        height = max([h for h, d in hd_list])
+        height = max(h for h, d in hd_list)
 
     if align == "baseline":
-        height_descent = max([h - d for h, d in hd_list])
-        descent = max([d for h, d in hd_list])
+        height_descent = max(h - d for h, d in hd_list)
+        descent = max(d for h, d in hd_list)
         height = height_descent + descent
         offsets = [0. for h, d in hd_list]
     elif align in ["left", "top"]:
@@ -465,8 +465,8 @@ def get_extent_offsets(self, renderer):
             return 2 * pad, 2 * pad, pad, pad, []
 
         if self.height is None:
-            height_descent = max([h - yd for w, h, xd, yd in whd_list])
-            ydescent = max([yd for w, h, xd, yd in whd_list])
+            height_descent = max(h - yd for w, h, xd, yd in whd_list)
+            ydescent = max(yd for w, h, xd, yd in whd_list)
             height = height_descent + ydescent
         else:
             height = self.height - 2 * pad  # width w/o pad
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -1773,7 +1773,7 @@ def _pprint_table(_table, leadingspace=2):
         for column, cell in zip(columns, row):
             column.append(cell)
 
-    col_len = [max([len(cell) for cell in column]) for column in columns]
+    col_len = [max(len(cell) for cell in column) for column in columns]
 
     lines = []
     table_formatstr = pad + '   '.join([('=' * cl) for cl in col_len])
@@ -2050,8 +2050,8 @@ def transmute(self, x0, y0, width, height, mutation_size):
 
             # boundary of the padded box
             x0, y0 = x0 - pad, y0 - pad,
-            return Path.circle((x0 + width/2., y0 + height/2.),
-                               (max([width, height]) / 2.))
+            return Path.circle((x0 + width / 2, y0 + height / 2),
+                               max(width, height) / 2)
 
     _style_list["circle"] = Circle
 
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1623,11 +1623,9 @@ def view_limits(self, vmin, vmax):
             vmax += 1
 
         if rcParams['axes.autolimit_mode'] == 'round_numbers':
-            exponent, remainder = _divmod(math.log10(vmax - vmin),
-                                         math.log10(max([self.numticks-1, 1])))
-            if remainder < 0.5:
-                exponent -= 1
-            scale = max([self.numticks-1, 1]) ** (-exponent)
+            exponent = round(math.log10(vmax - vmin)
+                             / math.log10(max(self.numticks - 1, 1))) - 1
+            scale = max(self.numticks - 1, 1) ** (-exponent)
             vmin = math.floor(scale * vmin) / scale
             vmax = math.ceil(scale * vmax) / scale
 
diff --git a/lib/matplotlib/tight_layout.py b/lib/matplotlib/tight_layout.py
@@ -188,22 +188,18 @@ def auto_adjust_subplotpars(fig, renderer,
                   top=1 - margin_top)
 
     if cols > 1:
-        hspace = max([sum(s)
-                      for i in range(rows)
-                      for s
-                      in hspaces[i * (cols + 1) + 1:(i + 1) * (cols + 1) - 1]])
-        hspace += hpad_inches / fig_width_inch
-        h_axes = ((1 - margin_right - margin_left) -
-                  hspace * (cols - 1)) / cols
-
+        hspace = (
+            max(sum(s)
+                for i in range(rows)
+                for s in hspaces[i * (cols + 1) + 1:(i + 1) * (cols + 1) - 1])
+            + hpad_inches / fig_width_inch)
+        h_axes = (1 - margin_right - margin_left - hspace * (cols - 1)) / cols
         kwargs["wspace"] = hspace / h_axes
 
     if rows > 1:
-        vspace = max([sum(s) for s in vspaces[cols:-cols]])
-        vspace += vpad_inches / fig_height_inch
-        v_axes = ((1 - margin_top - margin_bottom) -
-                  vspace * (rows - 1)) / rows
-
+        vspace = (max(sum(s) for s in vspaces[cols:-cols])
+                  + vpad_inches / fig_height_inch)
+        v_axes = (1 - margin_top - margin_bottom - vspace * (rows - 1)) / rows
         kwargs["hspace"] = vspace / v_axes
 
     return kwargs
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -761,10 +761,10 @@ def intersection(bbox1, bbox2):
                           bbox2.ymax < bbox1.ymin)
 
         if intersects:
-            x0 = max([bbox1.xmin, bbox2.xmin])
-            x1 = min([bbox1.xmax, bbox2.xmax])
-            y0 = max([bbox1.ymin, bbox2.ymin])
-            y1 = min([bbox1.ymax, bbox2.ymax])
+            x0 = max(bbox1.xmin, bbox2.xmin)
+            x1 = min(bbox1.xmax, bbox2.xmax)
+            y0 = max(bbox1.ymin, bbox2.ymin)
+            y1 = min(bbox1.ymax, bbox2.ymax)
             return Bbox.from_extents(x0, y0, x1, y1)
 
         return None
@@ -2115,7 +2115,7 @@ def contains_branch_seperately(self, transform):
 
     @property
     def depth(self):
-        return max([self._x.depth, self._y.depth])
+        return max(self._x.depth, self._y.depth)
 
     def contains_branch(self, other):
         # a blended transform cannot possibly contain a branch from two different transforms.
diff --git a/lib/mpl_toolkits/axisartist/axis_artist.py b/lib/mpl_toolkits/axisartist/axis_artist.py
@@ -714,37 +714,37 @@ def _get_ticklabels_offsets(self, renderer, label_direction):
         va, ha = self.get_va(), self.get_ha()
 
         if label_direction == "left":
-            pad = max([w for (w, h, d) in whd_list])
+            pad = max(w for w, h, d in whd_list)
             if ha == "left":
                 r = pad
             elif ha == "center":
                 r = .5 * pad
         elif label_direction == "right":
-            pad = max([w for (w, h, d) in whd_list])
+            pad = max(w for w, h, d in whd_list)
             if ha == "right":
                 r = pad
             elif ha == "center":
                 r = .5 * pad
         elif label_direction == "bottom":
-            pad = max([h for (w, h, d) in whd_list])
+            pad = max(h for w, h, d in whd_list)
             if va == "bottom":
                 r = pad
             elif va == "center":
                 r =.5 * pad
             elif va == "baseline":
-                max_ascent = max([(h-d) for (w, h, d) in whd_list])
-                max_descent = max([d for (w, h, d) in whd_list])
+                max_ascent = max(h - d for w, h, d in whd_list)
+                max_descent = max(d for w, h, d in whd_list)
                 r  = max_ascent
                 pad = max_ascent + max_descent
         elif label_direction == "top":
-            pad = max([h for (w, h, d) in whd_list])
+            pad = max(h for w, h, d in whd_list)
             if va == "top":
                 r = pad
             elif va == "center":
                 r =.5 * pad
             elif va == "baseline":
-                max_ascent = max([(h-d) for (w, h, d) in whd_list])
-                max_descent = max([d for (w, h, d) in whd_list])
+                max_ascent = max(h - d for w, h, d in whd_list)
+                max_descent = max(d for w, h, d in whd_list)
                 r  = max_descent
                 pad = max_ascent + max_descent
 
@@ -1432,16 +1432,16 @@ def _update_label(self, renderer):
 
         #print self._ticklabel_add_angle - self._axislabel_add_angle
         #if abs(self._ticklabel_add_angle - self._axislabel_add_angle)%360 > 90:
-        if self._ticklabel_add_angle !=  self._axislabel_add_angle:
+        if self._ticklabel_add_angle != self._axislabel_add_angle:
             if (self.major_ticks.get_visible() and not self.major_ticks.get_tick_out()) \
                or \
                (self.minor_ticks.get_visible() and not self.major_ticks.get_tick_out()):
                 axislabel_pad = self.major_ticks._ticksize
             else:
                 axislabel_pad = 0
         else:
-            axislabel_pad = max([self.major_ticklabels._axislabel_pad,
-                                 self.minor_ticklabels._axislabel_pad])
+            axislabel_pad = max(self.major_ticklabels._axislabel_pad,
+                                self.minor_ticklabels._axislabel_pad)
 
 
         #label_offset =  axislabel_pad + self.LABELPAD
@@ -1477,17 +1477,16 @@ def _draw_label2(self, renderer):
 
         #print self._ticklabel_add_angle - self._axislabel_add_angle
         #if abs(self._ticklabel_add_angle - self._axislabel_add_angle)%360 > 90:
-        if self._ticklabel_add_angle !=  self._axislabel_add_angle:
+        if self._ticklabel_add_angle != self._axislabel_add_angle:
             if (self.major_ticks.get_visible() and not self.major_ticks.get_tick_out()) \
                or \
                (self.minor_ticks.get_visible() and not self.major_ticks.get_tick_out()):
                 axislabel_pad = self.major_ticks._ticksize
             else:
                 axislabel_pad = 0
         else:
-            axislabel_pad = max([self.major_ticklabels._axislabel_pad,
-                                 self.minor_ticklabels._axislabel_pad])
-
+            axislabel_pad = max(self.major_ticklabels._axislabel_pad,
+                                self.minor_ticklabels._axislabel_pad)
 
         #label_offset =  axislabel_pad + self.LABELPAD
 
@@ -1497,8 +1496,7 @@ def _draw_label2(self, renderer):
         xy, angle_tangent = self._axis_artist_helper.get_axislabel_pos_angle(self.axes)
         if xy is None: return
 
-        angle_label = angle_tangent  - 90
-
+        angle_label = angle_tangent - 90
 
         x, y = xy
         self.label._set_ref_angle(angle_label+self._axislabel_add_angle)
diff --git a/lib/mpl_toolkits/tests/test_axes_grid1.py b/lib/mpl_toolkits/tests/test_axes_grid1.py
@@ -43,7 +43,7 @@ def test_divider_append_axes():
 
     # now determine nice limits by hand:
     binwidth = 0.25
-    xymax = np.max([np.max(np.fabs(x)), np.max(np.fabs(y))])
+    xymax = max(np.max(np.abs(x)), np.max(np.abs(y)))
     lim = (int(xymax/binwidth) + 1) * binwidth
 
     bins = np.arange(-lim, lim + binwidth, binwidth)
