[Scipy-svn] r6510 - trunk/scipy/optimize

scipy-svn@scip... scipy-svn@scip...
Wed Jun 16 10:21:49 CDT 2010


Author: charris
Date: 2010-06-16 10:21:49 -0500 (Wed, 16 Jun 2010)
New Revision: 6510

Modified:
   trunk/scipy/optimize/minpack.py
Log:
DEP: Remove deprecated warning keyword from fsolve.

Modified: trunk/scipy/optimize/minpack.py
===================================================================
--- trunk/scipy/optimize/minpack.py	2010-06-16 15:21:45 UTC (rev 6509)
+++ trunk/scipy/optimize/minpack.py	2010-06-16 15:21:49 UTC (rev 6510)
@@ -24,7 +24,7 @@
 
 def fsolve(func, x0, args=(), fprime=None, full_output=0,
            col_deriv=0, xtol=1.49012e-8, maxfev=0, band=None,
-           epsfcn=0.0, factor=100, diag=None, warning=True):
+           epsfcn=0.0, factor=100, diag=None):
     """
     Find the roots of a function.
 
@@ -47,9 +47,6 @@
     col_deriv : bool
         Specify whether the Jacobian function computes derivatives down
         the columns (faster, because there is no transpose operation).
-    warning : bool
-        Whether to print a warning message when the call is unsuccessful.
-        This option is deprecated, use the warnings module instead.
 
     Returns
     -------
@@ -107,9 +104,6 @@
     ``fsolve`` is a wrapper around MINPACK's hybrd and hybrj algorithms.
 
     """
-    if not warning :
-        msg = "The warning keyword is deprecated. Use the warnings module."
-        warnings.warn(msg, DeprecationWarning)
     x0 = array(x0, ndmin=1)
     n = len(x0)
     if type(args) != type(()): args = (args,)



More information about the Scipy-svn mailing list