[Scipy-svn] r4736 - in trunk/scipy/integrate: . tests

scipy-svn@scip... scipy-svn@scip...
Thu Sep 18 15:00:28 CDT 2008


Author: alan.mcintyre
Date: 2008-09-18 15:00:22 -0500 (Thu, 18 Sep 2008)
New Revision: 4736

Modified:
   trunk/scipy/integrate/ode.py
   trunk/scipy/integrate/quadpack.py
   trunk/scipy/integrate/quadrature.py
   trunk/scipy/integrate/tests/test_integrate.py
   trunk/scipy/integrate/tests/test_quadpack.py
Log:
Removed unused imports.
Moved imports to the top of modules.


Modified: trunk/scipy/integrate/ode.py
===================================================================
--- trunk/scipy/integrate/ode.py	2008-09-18 19:57:42 UTC (rev 4735)
+++ trunk/scipy/integrate/ode.py	2008-09-18 20:00:22 UTC (rev 4736)
@@ -147,7 +147,7 @@
 __version__ = "$Id$"
 __docformat__ = "restructuredtext en"
 
-from numpy import asarray, array, zeros, sin, int32, isscalar
+from numpy import asarray, array, zeros, int32, isscalar
 import re, sys
 
 #------------------------------------------------------------------------------

Modified: trunk/scipy/integrate/quadpack.py
===================================================================
--- trunk/scipy/integrate/quadpack.py	2008-09-18 19:57:42 UTC (rev 4735)
+++ trunk/scipy/integrate/quadpack.py	2008-09-18 20:00:22 UTC (rev 4736)
@@ -6,10 +6,10 @@
 import _quadpack
 import sys
 import numpy
+from numpy import inf, Inf
 
 error = _quadpack.error
 
-
 def quad_explain(output=sys.stdout):
     output.write("""
 Extra information for quad() inputs and outputs:
@@ -117,8 +117,6 @@
     return
 
 
-from numpy import inf, Inf
-
 def quad(func, a, b, args=(), full_output=0, epsabs=1.49e-8, epsrel=1.49e-8,
          limit=50, points=None, weight=None, wvar=None, wopts=None, maxp1=50,
          limlst=50):

Modified: trunk/scipy/integrate/quadrature.py
===================================================================
--- trunk/scipy/integrate/quadrature.py	2008-09-18 19:57:42 UTC (rev 4735)
+++ trunk/scipy/integrate/quadrature.py	2008-09-18 20:00:22 UTC (rev 4736)
@@ -6,7 +6,6 @@
 from scipy.special import gammaln
 from numpy import sum, ones, add, diff, isinf, isscalar, \
      asarray, real, trapz, arange, empty
-import scipy as sp
 import numpy as np
 
 def fixed_quad(func,a,b,args=(),n=5):

Modified: trunk/scipy/integrate/tests/test_integrate.py
===================================================================
--- trunk/scipy/integrate/tests/test_integrate.py	2008-09-18 19:57:42 UTC (rev 4735)
+++ trunk/scipy/integrate/tests/test_integrate.py	2008-09-18 20:00:22 UTC (rev 4736)
@@ -4,9 +4,8 @@
 """
 
 import numpy
-from numpy import (arange, zeros, array, dot, sqrt, cos, sin, absolute,
-                   eye, pi, exp, allclose)
-from scipy.linalg import norm
+from numpy import arange, zeros, array, dot, sqrt, cos, sin, eye, pi, exp, \
+                  allclose
 
 from numpy.testing import *
 from scipy.integrate import odeint, ode

Modified: trunk/scipy/integrate/tests/test_quadpack.py
===================================================================
--- trunk/scipy/integrate/tests/test_quadpack.py	2008-09-18 19:57:42 UTC (rev 4735)
+++ trunk/scipy/integrate/tests/test_quadpack.py	2008-09-18 20:00:22 UTC (rev 4736)
@@ -1,4 +1,3 @@
-import numpy
 from numpy import sqrt, cos, sin, arctan, exp, log, pi, Inf
 from numpy.testing import *
 from scipy.integrate import quad, dblquad, tplquad



More information about the Scipy-svn mailing list