safezip is (mostly) overrated.

anntzer · anntzer · commit 017ca24edd5a · 2016-12-02T10:34:23.000-08:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -2576,11 +2576,11 @@ def pie(self, x, explode=None, labels=None, colors=None,
           labels.
         """
 
-        x = np.asarray(x).astype(np.float32)
+        x = np.array(x, np.float32)
 
-        sx = float(x.sum())
+        sx = x.sum()
         if sx > 1:
-            x = np.divide(x, sx)
+            x /= sx
 
         if labels is None:
             labels = [''] * len(x)
@@ -2610,20 +2610,18 @@ def get_next_color():
         # set default values in wedge_prop
         if wedgeprops is None:
             wedgeprops = {}
-        if 'clip_on' not in wedgeprops:
-            wedgeprops['clip_on'] = False
+        wedgeprops.setdefault('clip_on', False)
 
         if textprops is None:
             textprops = {}
-        if 'clip_on' not in textprops:
-            textprops['clip_on'] = False
+        textprops.setdefault('clip_on', False)
 
         texts = []
         slices = []
         autotexts = []
 
         i = 0
-        for frac, label, expl in cbook.safezip(x, labels, explode):
+        for frac, label, expl in zip(x, labels, explode):
             x, y = center
             theta2 = (theta1 + frac) if counterclock else (theta1 - frac)
             thetam = 2 * math.pi * 0.5 * (theta1 + theta2)
diff --git a/lib/matplotlib/legend.py b/lib/matplotlib/legend.py
@@ -33,8 +33,7 @@
 
 from matplotlib import rcParams
 from matplotlib.artist import Artist, allow_rasterization
-from matplotlib.cbook import (is_string_like, iterable, silent_list, safezip,
-                              is_hashable)
+from matplotlib.cbook import is_string_like, iterable, silent_list, is_hashable
 from matplotlib.font_manager import FontProperties
 from matplotlib.lines import Line2D
 from matplotlib.patches import Patch, Rectangle, Shadow, FancyBboxPatch
@@ -653,29 +652,23 @@ def _init_legend_box(self, handles, labels, markerfirst=True):
                 handle_list.append(handler.legend_artist(self, orig_handle,
                                                          fontsize, handlebox))
 
-        if len(handleboxes) > 0:
-
+        if handleboxes:
             # We calculate number of rows in each column. The first
             # (num_largecol) columns will have (nrows+1) rows, and remaining
             # (num_smallcol) columns will have (nrows) rows.
             ncol = min(self._ncol, len(handleboxes))
             nrows, num_largecol = divmod(len(handleboxes), ncol)
             num_smallcol = ncol - num_largecol
-
             # starting index of each column and number of rows in it.
-            largecol = safezip(list(xrange(0,
-                                           num_largecol * (nrows + 1),
-                                           (nrows + 1))),
-                               [nrows + 1] * num_largecol)
-            smallcol = safezip(list(xrange(num_largecol * (nrows + 1),
-                                           len(handleboxes), nrows)),
-                               [nrows] * num_smallcol)
+            rows_per_col = [nrows + 1] * num_largecol + [nrows] * num_smallcol
+            start_idxs = np.concatenate([[0], np.cumsum(rows_per_col)[:-1]])
+            cols = zip(start_idxs, rows_per_col)
         else:
-            largecol, smallcol = [], []
+            cols = []
 
-        handle_label = safezip(handleboxes, labelboxes)
+        handle_label = list(zip(handleboxes, labelboxes))
         columnbox = []
-        for i0, di in largecol + smallcol:
+        for i0, di in cols:
             # pack handleBox and labelBox into itemBox
             itemBoxes = [HPacker(pad=0,
                                  sep=self.handletextpad * fontsize,
@@ -689,20 +682,13 @@ def _init_legend_box(self, handles, labels, markerfirst=True):
                 itemBoxes[-1].get_children()[0].set_minimumdescent(False)
 
             # pack columnBox
-            if markerfirst:
-                alignment = "baseline"
-            else:
-                alignment = "right"
+            alignment = "baseline" if markerfirst else "right"
             columnbox.append(VPacker(pad=0,
                                      sep=self.labelspacing * fontsize,
                                      align=alignment,
                                      children=itemBoxes))
 
-        if self._mode == "expand":
-            mode = "expand"
-        else:
-            mode = "fixed"
-
+        mode = "expand" if self._mode == "expand" else "fixed"
         sep = self.columnspacing * fontsize
         self._legend_handle_box = HPacker(pad=0,
                                           sep=sep, align="baseline",
