Merged revisions 8595 via svnmerge from

WeatherGod · WeatherGod · commit 7ceb74c555fe · 2010-07-29T21:59:45.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint ........ r8595 | weathergod | 2010-07-29 16:55:52 -0500 (Thu, 29 Jul 2010) | 2 lines Fix inconsistency with the handling of the 'weights' keyword and input data for hist(). ........ svn path=/trunk/matplotlib/; revision=8596
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -7551,6 +7551,8 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
                 'hist now uses the rwidth to give relative width '
                 'and not absolute width')
 
+        # Massage 'x' for processing.
+        # NOTE: Be sure any changes here is also done below to 'weights'
         if isinstance(x, np.ndarray) or not iterable(x[0]):
             # TODO: support masked arrays;
             x = np.asarray(x)
@@ -7577,8 +7579,9 @@ def hist(self, x, bins=10, range=None, normed=False, weights=None,
             if len(color) != nx:
                 raise ValueError("color kwarg must have one color per dataset")
 
+        # We need to do to 'weights' what was done to 'x'
         if weights is not None:
-            if isinstance(weights, np.ndarray):
+            if isinstance(weights, np.ndarray) or not iterable(weights[0]) :
                 w = np.array(weights)
                 if w.ndim == 2:
                     w = w.T
