[Scipy-svn] r4723 - in trunk/scipy/io: . arff/tests matlab/tests

[scipy-svn at scipy.org]

Author: alan.mcintyre
Date: 2008-09-18 14:12:41 -0500 (Thu, 18 Sep 2008)
New Revision: 4723

Modified:
   trunk/scipy/io/arff/tests/test_header.py
   trunk/scipy/io/fopen.py
   trunk/scipy/io/matlab/tests/test_mio.py
   trunk/scipy/io/mmio.py
   trunk/scipy/io/netcdf.py
Log:
Removed unused imports.
PEP8 conformance (one import per line).


Modified: trunk/scipy/io/arff/tests/test_header.py
===================================================================
--- trunk/scipy/io/arff/tests/test_header.py	2008-09-09 18:11:27 UTC (rev 4722)
+++ trunk/scipy/io/arff/tests/test_header.py	2008-09-18 19:12:41 UTC (rev 4723)
@@ -4,8 +4,7 @@
 
 from numpy.testing import *
 
-from scipy.io.arff.arffread import read_header, MetaData, parse_type, \
-                                   ParseArffError
+from scipy.io.arff.arffread import read_header, parse_type, ParseArffError
 
 data_path = os.path.join(os.path.dirname(__file__), 'data')
 

Modified: trunk/scipy/io/fopen.py
===================================================================
--- trunk/scipy/io/fopen.py	2008-09-09 18:11:27 UTC (rev 4722)
+++ trunk/scipy/io/fopen.py	2008-09-18 19:12:41 UTC (rev 4723)
@@ -2,7 +2,8 @@
 
 # Author: Travis Oliphant
 
-import struct, os, sys
+import struct
+import sys
 import types
 
 from numpy import *

Modified: trunk/scipy/io/matlab/tests/test_mio.py
===================================================================
--- trunk/scipy/io/matlab/tests/test_mio.py	2008-09-09 18:11:27 UTC (rev 4722)
+++ trunk/scipy/io/matlab/tests/test_mio.py	2008-09-18 19:12:41 UTC (rev 4723)
@@ -3,10 +3,10 @@
 import os
 from glob import glob
 from cStringIO import StringIO
-from tempfile import mkstemp, mkdtemp
+from tempfile import mkdtemp
 from numpy.testing import *
-from numpy import arange, array, eye, pi, cos, exp, sin, sqrt, ndarray,  \
-     zeros, reshape, transpose, empty
+from numpy import arange, array, pi, cos, exp, sin, sqrt, ndarray,  \
+     zeros, reshape, transpose
 import scipy.sparse as SP
 
 from scipy.io.matlab.mio import loadmat, savemat
@@ -15,11 +15,6 @@
 import shutil
 import gzip
 
-try:  # Python 2.3 support
-    from sets import Set as set
-except:
-    pass
-
 test_data_path = os.path.join(os.path.dirname(__file__), 'data')
 
 def _check_level(self, label, expected, actual):

Modified: trunk/scipy/io/mmio.py
===================================================================
--- trunk/scipy/io/mmio.py	2008-09-09 18:11:27 UTC (rev 4722)
+++ trunk/scipy/io/mmio.py	2008-09-18 19:12:41 UTC (rev 4723)
@@ -10,9 +10,8 @@
 #
 
 import os
-from numpy import asarray, real, imag, conj, zeros, ndarray, \
-                  empty, concatenate, ones, ascontiguousarray, \
-                  vstack, savetxt, fromfile, fromstring
+from numpy import asarray, real, imag, conj, zeros, ndarray, concatenate, \
+                  ones, ascontiguousarray, vstack, savetxt, fromfile, fromstring
 
 __all__ = ['mminfo','mmread','mmwrite', 'MMFile']
 

Modified: trunk/scipy/io/netcdf.py
===================================================================
--- trunk/scipy/io/netcdf.py	2008-09-09 18:11:27 UTC (rev 4722)
+++ trunk/scipy/io/netcdf.py	2008-09-18 19:12:41 UTC (rev 4723)
@@ -15,7 +15,6 @@
 __all__ = ['netcdf_file', 'netcdf_variable']
 
 import struct
-import itertools
 import mmap
 
 from numpy import ndarray, zeros, array