drop "new" keyword of np.histogram() for numpy 1.2 or later

leejjoon · leejjoon · commit 2fb47bcded6b · 2008-12-07T20:40:12.000Z
svn path=/trunk/matplotlib/; revision=6503
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2008-12-07 drop the deprecated "new" keyword of np.histogram() for
+           numpy 1.2 or later.  -JJL
+
 2008-12-06 Fixed a bug in svg backend that new_figure_manager()
 	   ignores keywords arguments such as figsize, etc. -JJL
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -6550,12 +6550,20 @@ def hist(self, x, bins=10, range=None, normed=False, cumulative=False,
         # case do not autoscale axes.
         binsgiven = (cbook.iterable(bins) or range != None)
 
+        # check the version of the numpy
+        np_version = float(".".join(np.__version__.split(".")[:2]))
+        if np_version < 1.2: # version 1.1 
+            hist_kwargs = dict(range=range,
+                               normed=bool(normed), new=True)
+        else: # version 1.2 and later, drop new=True
+            hist_kwargs = dict(range=range,
+                               normed=bool(normed))
+
         n = []
         for i in xrange(len(x)):
             # this will automatically overwrite bins,
             # so that each histogram uses the same bins
-            m, bins = np.histogram(x[i], bins, range=range,
-                normed=bool(normed), new=True)
+            m, bins = np.histogram(x[i], bins, **hist_kwargs)
             n.append(m)
 
         if cumulative:
