[Scipy-svn] r3661 - branches/io_new

[scipy-svn at scipy.org]

Author: jarrod.millman
Date: 2007-12-14 17:45:19 -0600 (Fri, 14 Dec 2007)
New Revision: 3661

Modified:
   branches/io_new/__init__.py
Log:
cleaned up imports


Modified: branches/io_new/__init__.py
===================================================================
--- branches/io_new/__init__.py	2007-12-14 23:44:51 UTC (rev 3660)
+++ branches/io_new/__init__.py	2007-12-14 23:45:19 UTC (rev 3661)
@@ -1,4 +1,3 @@
-
 #
 # io - Data input and output
 #
@@ -7,18 +6,23 @@
 
 from numpyio import packbits, unpackbits, bswap, fread, fwrite, \
      convert_objectarray
+
 # matfile read and write
 from matlab.mio import loadmat, savemat
+
 # netCDF file support
-from netcdf import *
+from netcdf import netcdf_file, netcdf_variable
+
 from npfile import npfile
+
 from recaster import sctype_attributes, Recaster
-from array_import import *
-from data_store import *
-from pickler import *
 
-from mmio import mminfo,mmread,mmwrite
+from array_import import read_array, write_array
+from data_store import read_array, write_array
+from pickler import objload, objsave
 
+from mmio import mminfo, mmread, mmwrite
+
 __all__ = filter(lambda s:not s.startswith('_'),dir())
 from numpy.testing import NumpyTest
 test = NumpyTest().test