Use enumerate and np.arange instead of range. Raise error if bottom (bar) or left (barh) is list of strings

Umair Idris · Umair Idris · commit 1627e8e85359 · 2015-03-23T13:10:32.000-04:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1946,10 +1946,13 @@ def make_iterable(x):
             if len(bottom) == 1:
                 bottom *= nbars
             if nbars and cbook.is_sequence_of_strings(left):
-                ticks_loc = [i + width[i]/2 for i in range(nbars)]
+                ticks_loc = [i + w/2 for i, w in enumerate(width)]
                 self.xaxis.set_ticks(ticks_loc)
                 self.xaxis.set_ticklabels(left)
-                left = range(nbars)
+                left = np.arange(nbars)
+            if nbars and cbook.is_sequence_of_strings(bottom):
+                raise ValueError('bottom must be scalar or sequence of scalar '
+                                 'for vertical bar')
         elif orientation == 'horizontal':
             self._process_unit_info(xdata=width, ydata=bottom, kwargs=kwargs)
             if log:
@@ -1966,10 +1969,13 @@ def make_iterable(x):
             if len(height) == 1:
                 height *= nbars
             if nbars and cbook.is_sequence_of_strings(bottom):
-                ticks_loc = [i + height[i]/2 for i in range(nbars)]
+                ticks_loc = [i + h/2 for i, h in enumerate(height)]
                 self.yaxis.set_ticks(ticks_loc)
                 self.yaxis.set_ticklabels(bottom)
-                bottom = range(nbars)
+                bottom = np.arange(nbars)
+            if nbars and cbook.is_sequence_of_strings(left):
+                raise ValueError('left must be scalar or sequence of scalar '
+                                 'for horizontal bar')
         else:
             raise ValueError('invalid orientation: %s' % orientation)
 
