[Scipy-svn] r6574 - trunk/scipy/linalg/tests

[scipy-svn at scipy.org]

Author: warren.weckesser
Date: 2010-06-27 08:52:46 -0500 (Sun, 27 Jun 2010)
New Revision: 6574

Modified:
   trunk/scipy/linalg/tests/test_atlas_version.py
   trunk/scipy/linalg/tests/test_basic.py
   trunk/scipy/linalg/tests/test_blas.py
   trunk/scipy/linalg/tests/test_fblas.py
   trunk/scipy/linalg/tests/test_lapack.py
   trunk/scipy/linalg/tests/test_matfuncs.py
   trunk/scipy/linalg/tests/test_special_matrices.py
Log:
TST: Don't use 'import *'.

Modified: trunk/scipy/linalg/tests/test_atlas_version.py
===================================================================
--- trunk/scipy/linalg/tests/test_atlas_version.py	2010-06-27 13:51:05 UTC (rev 6573)
+++ trunk/scipy/linalg/tests/test_atlas_version.py	2010-06-27 13:52:46 UTC (rev 6574)
@@ -3,8 +3,6 @@
 # Created by: Pearu Peterson, October 2003
 #
 
-from numpy.testing import *
-
 import scipy.linalg.atlas_version
 
 

Modified: trunk/scipy/linalg/tests/test_basic.py
===================================================================
--- trunk/scipy/linalg/tests/test_basic.py	2010-06-27 13:51:05 UTC (rev 6573)
+++ trunk/scipy/linalg/tests/test_basic.py	2010-06-27 13:52:46 UTC (rev 6574)
@@ -25,10 +25,11 @@
         float32, zeros_like
 import numpy.linalg as linalg
 
-from numpy.testing import *
+from numpy.testing import TestCase, rand, run_module_suite, assert_raises, \
+    assert_equal, assert_almost_equal, assert_array_almost_equal
 
 from scipy.linalg import solve, inv, det, lstsq, pinv, pinv2, norm,\
-        solve_banded, solveh_banded, cholesky_banded
+        solve_banded, solveh_banded
 
 
 def random(size):

Modified: trunk/scipy/linalg/tests/test_blas.py
===================================================================
--- trunk/scipy/linalg/tests/test_blas.py	2010-06-27 13:51:05 UTC (rev 6573)
+++ trunk/scipy/linalg/tests/test_blas.py	2010-06-27 13:52:46 UTC (rev 6574)
@@ -12,7 +12,9 @@
 
 import math
 
-from numpy.testing import *
+from numpy.testing import TestCase, run_module_suite, assert_equal, \
+    assert_almost_equal, assert_array_almost_equal
+    
 from scipy.linalg import fblas, cblas
 
 

Modified: trunk/scipy/linalg/tests/test_fblas.py
===================================================================
--- trunk/scipy/linalg/tests/test_fblas.py	2010-06-27 13:51:05 UTC (rev 6573)
+++ trunk/scipy/linalg/tests/test_fblas.py	2010-06-27 13:52:46 UTC (rev 6574)
@@ -10,7 +10,8 @@
                   zeros, shape, transpose, newaxis, common_type, conjugate
 from scipy.linalg import fblas
 
-from numpy.testing import *
+from numpy.testing import TestCase, run_module_suite, assert_array_equal, \
+    assert_array_almost_equal
 
 
 #decimal accuracy to require between Python and LAPACK/BLAS calculations

Modified: trunk/scipy/linalg/tests/test_lapack.py
===================================================================
--- trunk/scipy/linalg/tests/test_lapack.py	2010-06-27 13:51:05 UTC (rev 6573)
+++ trunk/scipy/linalg/tests/test_lapack.py	2010-06-27 13:52:46 UTC (rev 6574)
@@ -3,7 +3,8 @@
 # Created by: Pearu Peterson, September 2002
 #
 
-from numpy.testing import *
+from numpy.testing import TestCase, run_module_suite, assert_equal, \
+    assert_array_almost_equal
 from numpy import ones
 
 from scipy.linalg import flapack, clapack

Modified: trunk/scipy/linalg/tests/test_matfuncs.py
===================================================================
--- trunk/scipy/linalg/tests/test_matfuncs.py	2010-06-27 13:51:05 UTC (rev 6573)
+++ trunk/scipy/linalg/tests/test_matfuncs.py	2010-06-27 13:52:46 UTC (rev 6574)
@@ -7,9 +7,8 @@
 """
 
 from numpy import array, identity, dot, sqrt
-from numpy.testing import *
+from numpy.testing import TestCase, run_module_suite, assert_array_almost_equal
 
-import scipy.linalg
 from scipy.linalg import signm, logm, sqrtm, expm, expm2, expm3
 
 

Modified: trunk/scipy/linalg/tests/test_special_matrices.py
===================================================================
--- trunk/scipy/linalg/tests/test_special_matrices.py	2010-06-27 13:51:05 UTC (rev 6573)
+++ trunk/scipy/linalg/tests/test_special_matrices.py	2010-06-27 13:52:46 UTC (rev 6574)
@@ -1,7 +1,8 @@
 """Tests for functions in special_matrices.py."""
 
 from numpy import arange, add, array, eye, all, copy
-from numpy.testing import *
+from numpy.testing import TestCase, run_module_suite, assert_raises, \
+    assert_equal, assert_array_equal
 
 from scipy.linalg import toeplitz, hankel, circulant, hadamard, leslie, \
                             companion, tri, triu, tril, kron, block_diag