SF.net SVN: matplotlib:[6590] trunk/matplotlib

[<mme...@us...>]

Revision: 6590
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6590&view=rev
Author:   mmetz_bn
Date:     2008-12-12 14:05:20 +0000 (Fri, 12 Dec 2008)

Log Message:
-----------
Merged revisions 6589 via svnmerge from 
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
........

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/axes.py

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008-12-12 13:58:24 UTC (rev 6589)
+++ trunk/matplotlib/CHANGELOG	2008-12-12 14:05:20 UTC (rev 6590)
@@ -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 

Modified: trunk/matplotlib/lib/matplotlib/axes.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axes.py	2008-12-12 13:58:24 UTC (rev 6589)
+++ trunk/matplotlib/lib/matplotlib/axes.py	2008-12-12 14:05:20 UTC (rev 6590)
@@ -6573,10 +6573,10 @@
         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))
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.