[Numpy-svn] r8341 - branches/1.4.x/numpy/lib

[numpy-svn at scipy.org]

Author: rgommers
Date: 2010-04-18 04:34:57 -0500 (Sun, 18 Apr 2010)
New Revision: 8341

Modified:
   branches/1.4.x/numpy/lib/function_base.py
Log:
Update the histogram warning - the 'new' keyword will be removed in 2.0.

Rationale: It was not removed in 1.4.0, so should not be removed now.

Modified: branches/1.4.x/numpy/lib/function_base.py
===================================================================
--- branches/1.4.x/numpy/lib/function_base.py	2010-04-18 09:31:44 UTC (rev 8340)
+++ branches/1.4.x/numpy/lib/function_base.py	2010-04-18 09:34:57 UTC (rev 8341)
@@ -78,7 +78,7 @@
           * False : the old behaviour is used and a DeprecationWarning
             is raised.
         As of NumPy 1.3, this keyword should not be used explicitly since it
-        will disappear in NumPy 1.4.
+        will disappear in NumPy 2.0.
 
     Returns
     -------
@@ -128,7 +128,7 @@
     if new == False:
         warnings.warn("""
         The histogram semantics being used is now deprecated and
-        will disappear in NumPy 1.4.  Please update your code to
+        will disappear in NumPy 2.0.  Please update your code to
         use the default semantics.
         """, DeprecationWarning)
 
@@ -181,7 +181,7 @@
         if new is True:
             warnings.warn("""
             The new semantics of histogram is now the default and the `new`
-            keyword will be removed in NumPy 1.4.
+            keyword will be removed in NumPy 2.0.
             """, Warning)
         a = asarray(a)
         if weights is not None:
@@ -2051,7 +2051,7 @@
     >>> plt.ylabel("Amplitude")
     >>> plt.xlabel("Sample")
     >>> plt.show()
-    
+
     >>> plt.figure()
     >>> A = fft(window, 2048) / 25.5
     >>> mag = abs(fftshift(A))
@@ -2150,7 +2150,7 @@
     >>> plt.ylabel("Amplitude")
     >>> plt.xlabel("Sample")
     >>> plt.show()
-    
+
     >>> plt.figure()
     >>> A = fft(window, 2048) / 25.5
     >>> mag = abs(fftshift(A))