Merge v1.4.x into master

tacaswell · tacaswell · commit c8ed7ba6ebd1 · 2014-12-29T22:20:55.000-05:00
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -2,11 +2,10 @@
                         unicode_literals)
 
 import six
-from six.moves import reduce, xrange, zip
+from six.moves import reduce, xrange, zip, zip_longest
 
 import math
 import warnings
-import itertools
 
 import numpy as np
 from numpy import ma
@@ -5416,14 +5415,16 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             Input values, this takes either a single array or a sequency of
             arrays which are not required to be of the same length
 
-        bins : integer or array_like, optional, default: 10
+        bins : integer or array_like, optional
             If an integer is given, `bins + 1` bin edges are returned,
             consistently with :func:`numpy.histogram` for numpy version >=
             1.3.
 
             Unequally spaced bins are supported if `bins` is a sequence.
 
-        range : tuple, optional, default: None
+            default is 10
+
+        range : tuple or None, optional
             The lower and upper range of the bins. Lower and upper outliers
             are ignored. If not provided, `range` is (x.min(), x.max()). Range
             has no effect if `bins` is a sequence.
@@ -5432,20 +5433,26 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             is based on the specified bin range instead of the
             range of x.
 
-        normed : boolean, optional, default: False
+            Default is ``None``
+
+        normed : boolean, optional
             If `True`, the first element of the return tuple will
             be the counts normalized to form a probability density, i.e.,
             ``n/(len(x)`dbin)``, i.e., the integral of the histogram will sum
             to 1. If *stacked* is also *True*, the sum of the histograms is
             normalized to 1.
 
-        weights : array_like, shape (n, ), optional, default: None
+            Default is ``False``
+
+        weights : (n, ) array_like or None, optional
             An array of weights, of the same shape as `x`.  Each value in `x`
             only contributes its associated weight towards the bin count
             (instead of 1).  If `normed` is True, the weights are normalized,
             so that the integral of the density over the range remains 1.
 
-        cumulative : boolean, optional, default : False
+            Default is ``None``
+
+        cumulative : boolean, optional
             If `True`, then a histogram is computed where each bin gives the
             counts in that bin plus all bins for smaller values. The last bin
             gives the total number of datapoints.  If `normed` is also `True`
@@ -5455,13 +5462,17 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             `True`, then the histogram is normalized such that the first bin
             equals 1.
 
-        bottom : array_like, scalar, or None, default: None
+            Default is ``False``
+
+        bottom : array_like, scalar, or None
             Location of the bottom baseline of each bin.  If a scalar,
             the base line for each bin is shifted by the same amount.
             If an array, each bin is shifted independently and the length
             of bottom must match the number of bins.  If None, defaults to 0.
 
-        histtype : ['bar' | 'barstacked' | 'step' | 'stepfilled'], optional
+            Default is ``None``
+
+        histtype : {'bar', 'barstacked', 'step',  'stepfilled'}, optional
             The type of histogram to draw.
 
             - 'bar' is a traditional bar-type histogram.  If multiple data
@@ -5476,7 +5487,9 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             - 'stepfilled' generates a lineplot that is by default
               filled.
 
-        align : ['left' | 'mid' | 'right'], optional, default: 'mid'
+            Default is 'bar'
+
+        align : {'left', 'mid', 'right'}, optional
             Controls how the histogram is plotted.
 
                 - 'left': bars are centered on the left bin edges.
@@ -5485,34 +5498,47 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
 
                 - 'right': bars are centered on the right bin edges.
 
-        orientation : ['horizontal' | 'vertical'], optional
+            Default is 'mid'
+
+        orientation : {'horizontal', 'vertical'}, optional
             If 'horizontal', `~matplotlib.pyplot.barh` will be used for
             bar-type histograms and the *bottom* kwarg will be the left edges.
 
-        rwidth : scalar, optional, default: None
+        rwidth : scalar or None, optional
             The relative width of the bars as a fraction of the bin width.  If
-            `None`, automatically compute the width. Ignored if `histtype` =
-            'step' or 'stepfilled'.
+            `None`, automatically compute the width.
 
-        log : boolean, optional, default : False
+            Ignored if `histtype` is 'step' or 'stepfilled'.
+
+            Default is ``None``
+
+        log : boolean, optional
             If `True`, the histogram axis will be set to a log scale. If `log`
             is `True` and `x` is a 1D array, empty bins will be filtered out
             and only the non-empty (`n`, `bins`, `patches`) will be returned.
 
-        color : color or array_like of colors, optional, default: None
+            Default is ``False``
+
+        color : color or array_like of colors or None, optional
             Color spec or sequence of color specs, one per dataset.  Default
             (`None`) uses the standard line color sequence.
 
-        label : string, optional, default: ''
+            Default is ``None``
+
+        label : string or None, optional
             String, or sequence of strings to match multiple datasets.  Bar
             charts yield multiple patches per dataset, but only the first gets
             the label, so that the legend command will work as expected.
 
-        stacked : boolean, optional, default : False
+            default is ``None``
+
+        stacked : boolean, optional
             If `True`, multiple data are stacked on top of each other If
             `False` multiple data are aranged side by side if histtype is
             'bar' or on top of each other if histtype is 'step'
 
+            Default is ``False``
+
         Returns
         -------
         n : array or list of arrays
@@ -5868,16 +5894,10 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             labels = [None]
         elif is_string_like(label):
             labels = [label]
-        elif is_sequence_of_strings(label):
-            labels = list(label)
         else:
-            raise ValueError(
-                'invalid label: must be string or sequence of strings')
-
-        if len(labels) < nx:
-            labels += [None] * (nx - len(labels))
+            labels = [str(lab) for lab in label]
 
-        for (patch, lbl) in zip(patches, labels):
+        for (patch, lbl) in zip_longest(patches, labels, fillvalue=None):
             if patch:
                 p = patch[0]
                 p.update(kwargs)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -3480,6 +3480,11 @@ def test_color_None():
     ax.plot([1,2], [1,2], color=None)
     plt.show()
 
+@cleanup
+def test_numerical_hist_label():
+    fig, ax = plt.subplots()
+    ax.hist([range(15)] * 5, label=range(5))
+
 if __name__ == '__main__':
     import nose
     import sys
