Merged revisions 6589 via svnmerge from

mmetz-bn · mmetz-bn · commit bfd8fa79647c · 2008-12-12T14:05:20.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6589 | mmetz_bn | 2008-12-12 14:58:24 +0100 (Fri, 12 Dec 2008) | 1 line fix warning in hist for numpy 1.2 ........ svn path=/trunk/matplotlib/; revision=6590
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2008-12-12 Fixed warning in hist() with numpy 1.2 - MM
+
 2008-12-12 Removed external packages: configobj and enthought.traits
            which are only required by the experimental traited config
            and are somewhat out of date. If needed, install them 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -6573,10 +6573,10 @@ def hist(self, x, bins=10, range=None, normed=False, cumulative=False,
         binsgiven = (cbook.iterable(bins) or range != None)
 
         # check the version of the numpy
-        if np.__version__ < "1.2": # version 1.1
+        if np.__version__ < "1.3": # version 1.1 and 1.2
             hist_kwargs = dict(range=range,
                                normed=bool(normed), new=True)
-        else: # version 1.2 and later, drop new=True
+        else: # version 1.3 and later, drop new=True
             hist_kwargs = dict(range=range,
                                normed=bool(normed))
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2008-12-12 Fixed warning in hist() with numpy 1.2 - MM`
	`2`	`+`
`1`	`3`	`2008-12-12 Removed external packages: configobj and enthought.traits`
`2`	`4`	`which are only required by the experimental traited config`
`3`	`5`	`and are somewhat out of date. If needed, install them`