More simplification of ax.bar().

anntzer · anntzer · commit d5e73410a66e · 2017-07-29T16:41:34.000-07:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -2003,14 +2003,11 @@ def bar(self, left, height, width=0.8, bottom=None, **kwargs):
         label = kwargs.pop('label', '')
         tick_labels = kwargs.pop('tick_label', None)
 
-        # make them safe to take len() of
         _left = left
-        left = np.atleast_1d(left)
-        height = np.atleast_1d(height)
-        width = np.atleast_1d(width)
         _bottom = bottom
-        bottom = np.atleast_1d(bottom)
-        linewidth = np.atleast_1d(linewidth)
+        left, height, width, bottom = np.broadcast_arrays(
+            # Make args iterable too.
+            np.atleast_1d(left), height, width, bottom)
 
         adjust_ylim = False
         adjust_xlim = False
@@ -2022,11 +2019,7 @@ def bar(self, left, height, width=0.8, bottom=None, **kwargs):
             if _bottom is None:
                 if self.get_yscale() == 'log':
                     adjust_ylim = True
-                bottom = [0]
-
-            nbars = len(left)
-            width = _backports_np.broadcast_to(width, nbars)
-            bottom = _backports_np.broadcast_to(bottom, nbars)
+                bottom = np.zeros_like(bottom)
 
             tick_label_axis = self.xaxis
             tick_label_position = left
@@ -2038,54 +2031,23 @@ def bar(self, left, height, width=0.8, bottom=None, **kwargs):
             if _left is None:
                 if self.get_xscale() == 'log':
                     adjust_xlim = True
-                left = [0]
-
-            nbars = len(bottom)
-            left = _backports_np.broadcast_to(left, nbars)
-            height = _backports_np.broadcast_to(height, nbars)
+                left = np.zeros_like(left)
 
             tick_label_axis = self.yaxis
             tick_label_position = bottom
         else:
             raise ValueError('invalid orientation: %s' % orientation)
 
-        if len(height) == 1:
-            height *= nbars
-        if len(width) == 1:
-            width *= nbars
-        if len(linewidth) < nbars:
-            linewidth = np.tile(linewidth, nbars)
-
-        color = list(mcolors.to_rgba_array(color))
-        if len(color) == 0:  # until to_rgba_array is changed
-            color = [[0, 0, 0, 0]]
-        if len(color) < nbars:
-            color *= nbars
-
+        linewidth = itertools.cycle(np.atleast_1d(linewidth))
+        color = itertools.chain(itertools.cycle(mcolors.to_rgba_array(color)),
+                                # Fallback if color == "none".
+                                itertools.repeat([0, 0, 0, 0]))
         if edgecolor is None:
-            edgecolor = [None] * nbars
+            edgecolor = itertools.repeat(None)
         else:
-            edgecolor = list(mcolors.to_rgba_array(edgecolor))
-            if len(edgecolor) == 0:     # until to_rgba_array is changed
-                edgecolor = [[0, 0, 0, 0]]
-            if len(edgecolor) < nbars:
-                edgecolor *= nbars
-
-        # input validation
-        if len(left) != nbars:
-            raise ValueError("incompatible sizes: argument 'left' must "
-                             "be length %d or scalar" % nbars)
-        if len(height) != nbars:
-            raise ValueError("incompatible sizes: argument 'height' "
-                             "must be length %d or scalar" % nbars)
-        if len(width) != nbars:
-            raise ValueError("incompatible sizes: argument 'width' "
-                             "must be length %d or scalar" % nbars)
-        if len(bottom) != nbars:
-            raise ValueError("incompatible sizes: argument 'bottom' "
-                             "must be length %d or scalar" % nbars)
-
-        patches = []
+            edgecolor = itertools.chain(mcolors.to_rgba_array(edgecolor),
+                                        # Fallback if edgecolor == "none".
+                                        itertools.repeat([0, 0, 0, 0]))
 
         # lets do some conversions now since some types cannot be
         # subtracted uniformly
@@ -2103,13 +2065,14 @@ def bar(self, left, height, width=0.8, bottom=None, **kwargs):
 
         if align == 'center':
             if orientation == 'vertical':
-                left = [l - w / 2. for l, w in zip(left, width)]
+                left = left - width / 2
             elif orientation == 'horizontal':
-                bottom = [b - h / 2. for b, h in zip(bottom, height)]
+                bottom = bottom - height / 2
 
         elif align != 'edge':
             raise ValueError('invalid alignment: %s' % align)
 
+        patches = []
         args = zip(left, bottom, width, height, color, edgecolor, linewidth)
         for l, b, w, h, c, e, lw in args:
             r = mpatches.Rectangle(
@@ -2174,7 +2137,7 @@ def bar(self, left, height, width=0.8, bottom=None, **kwargs):
         self.add_container(bar_container)
 
         if tick_labels is not None:
-            tick_labels = _backports_np.broadcast_to(tick_labels, nbars)
+            tick_labels = _backports_np.broadcast_to(tick_labels, len(patches))
             tick_label_axis.set_ticks(tick_label_position)
             tick_label_axis.set_ticklabels(tick_labels)
 
