[Scipy-svn] r3410 - trunk/scipy/io/nifti

[scipy-svn at scipy.org]

Author: jarrod.millman
Date: 2007-10-04 03:15:40 -0500 (Thu, 04 Oct 2007)
New Revision: 3410

Modified:
   trunk/scipy/io/nifti/__init__.py
   trunk/scipy/io/nifti/niftiimage.py
   trunk/scipy/io/nifti/setup.py
Log:
minor cleanups


Modified: trunk/scipy/io/nifti/__init__.py
===================================================================
--- trunk/scipy/io/nifti/__init__.py	2007-10-04 07:51:43 UTC (rev 3409)
+++ trunk/scipy/io/nifti/__init__.py	2007-10-04 08:15:40 UTC (rev 3410)
@@ -15,4 +15,4 @@
 #
 ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ###
 
-from scipy.io.nifti.niftiimage import *
+from scipy.io.nifti.niftiimage import NiftiImage

Modified: trunk/scipy/io/nifti/niftiimage.py
===================================================================
--- trunk/scipy/io/nifti/niftiimage.py	2007-10-04 07:51:43 UTC (rev 3409)
+++ trunk/scipy/io/nifti/niftiimage.py	2007-10-04 08:15:40 UTC (rev 3410)
@@ -16,9 +16,8 @@
 ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ##
 
 # the swig wrapper if the NIfTI C library
-import nifticlib
-import os
 import numpy
+import scipy.io.nifticlib as nifticlib
 
 
 class NiftiImage(object):

Modified: trunk/scipy/io/nifti/setup.py
===================================================================
--- trunk/scipy/io/nifti/setup.py	2007-10-04 07:51:43 UTC (rev 3409)
+++ trunk/scipy/io/nifti/setup.py	2007-10-04 08:15:40 UTC (rev 3410)
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
-import os
+
 from os.path import isfile, join, dirname
-import sys
 import numpy
 
 nifti_wrapper_file = join('nifticlib.py')
@@ -11,13 +10,12 @@
     open(nifti_wrapper_file, 'w')
 
 # find numpy headers
-numpy_headers = join(dirname(numpy.__file__),'core','include')
+numpy_headers = join(dirname(numpy.__file__), 'core', 'include')
 
-def configuration(parent_package='',top_path=None):
+def configuration(parent_package='', top_path=None):
     from numpy.distutils.misc_util import Configuration
-    from numpy.distutils.system_info import get_info
+    config = Configuration('nifti', parent_package, top_path)
 
-    config = Configuration('nifti',parent_package,top_path)
     config.add_data_dir('tests')
 
     include_dirs = [