[Scipy-svn] r4734 - in trunk/scipy: interpolate interpolate/tests odr/tests stsci/image/lib

[scipy-svn at scipy.org]

Author: alan.mcintyre
Date: 2008-09-18 14:55:02 -0500 (Thu, 18 Sep 2008)
New Revision: 4734

Modified:
   trunk/scipy/interpolate/interpolate.py
   trunk/scipy/interpolate/polyint.py
   trunk/scipy/interpolate/tests/test_fitpack.py
   trunk/scipy/odr/tests/test_odr.py
   trunk/scipy/stsci/image/lib/combine.py
Log:
Removed unused imports.


Modified: trunk/scipy/interpolate/interpolate.py
===================================================================
--- trunk/scipy/interpolate/interpolate.py	2008-09-18 19:50:45 UTC (rev 4733)
+++ trunk/scipy/interpolate/interpolate.py	2008-09-18 19:55:02 UTC (rev 4734)
@@ -6,11 +6,10 @@
 __all__ = ['interp1d', 'interp2d', 'spline', 'spleval', 'splmake', 'spltopp',
            'ppform', 'lagrange']
 
-from numpy import shape, sometrue, rank, array, transpose, \
-     swapaxes, searchsorted, clip, take, ones, putmask, less, greater, \
-     logical_or, atleast_1d, atleast_2d, meshgrid, ravel, dot, poly1d
+from numpy import shape, sometrue, rank, array, transpose, searchsorted, \
+                  ones, logical_or, atleast_1d, atleast_2d, meshgrid, ravel, \
+                  dot, poly1d
 import numpy as np
-import scipy.linalg as slin
 import scipy.special as spec
 import math
 

Modified: trunk/scipy/interpolate/polyint.py
===================================================================
--- trunk/scipy/interpolate/polyint.py	2008-09-18 19:50:45 UTC (rev 4733)
+++ trunk/scipy/interpolate/polyint.py	2008-09-18 19:55:02 UTC (rev 4734)
@@ -1,6 +1,5 @@
 import numpy as np
 from scipy import factorial
-from numpy import poly1d
 
 __all__ = ["KroghInterpolator", "krogh_interpolate", "BarycentricInterpolator", "barycentric_interpolate", "PiecewisePolynomial", "piecewise_polynomial_interpolate","approximate_taylor_polynomial"]
 

Modified: trunk/scipy/interpolate/tests/test_fitpack.py
===================================================================
--- trunk/scipy/interpolate/tests/test_fitpack.py	2008-09-18 19:50:45 UTC (rev 4733)
+++ trunk/scipy/interpolate/tests/test_fitpack.py	2008-09-18 19:55:02 UTC (rev 4734)
@@ -12,13 +12,10 @@
 """
 #import libwadpy
 
-import sys
 from numpy.testing import *
 from numpy import array, diff
-from scipy.interpolate.fitpack2 import UnivariateSpline,LSQUnivariateSpline,\
-     InterpolatedUnivariateSpline
-from scipy.interpolate.fitpack2 import LSQBivariateSpline, \
-     SmoothBivariateSpline, RectBivariateSpline
+from scipy.interpolate.fitpack2 import UnivariateSpline, LSQBivariateSpline, \
+    SmoothBivariateSpline, RectBivariateSpline
 
 class TestUnivariateSpline(TestCase):
     def test_linear_constant(self):

Modified: trunk/scipy/odr/tests/test_odr.py
===================================================================
--- trunk/scipy/odr/tests/test_odr.py	2008-09-18 19:50:45 UTC (rev 4733)
+++ trunk/scipy/odr/tests/test_odr.py	2008-09-18 19:55:02 UTC (rev 4734)
@@ -1,6 +1,3 @@
-# Standard library imports.
-import cPickle
-
 # Scipy imports.
 import numpy as np
 from numpy import pi

Modified: trunk/scipy/stsci/image/lib/combine.py
===================================================================
--- trunk/scipy/stsci/image/lib/combine.py	2008-09-18 19:50:45 UTC (rev 4733)
+++ trunk/scipy/stsci/image/lib/combine.py	2008-09-18 19:55:02 UTC (rev 4734)
@@ -1,8 +1,6 @@
 import numpy as np
 from _combine import combine as _comb
-import operator as _operator
 
-
 def _combine_f(funcstr, arrays, output=None, outtype=None, nlow=0, nhigh=0, badmasks=None):
     arrays = [ np.asarray(a) for a in arrays ]
     shape = arrays[0].shape