MNT : simplified handling of wrong number of labels

tacaswell · tacaswell · commit c2fff54427db · 2014-12-27T20:44:45.000-05:00
instead of padding length of labels by hand, use `zip_longest`
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
@@ -5856,10 +5855,7 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
         else:
             labels = [str(lab) for lab in label]
 
-        if len(labels) < nx:
-            labels += [None] * (nx - len(labels))
-
-        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)
