[Scipy-svn] r3002 - in trunk/Lib: cluster fftpack interpolate odr stats weave

[scipy-svn at scipy.org]

Author: jarrod.millman
Date: 2007-05-15 04:41:19 -0500 (Tue, 15 May 2007)
New Revision: 3002

Modified:
   trunk/Lib/cluster/setup.py
   trunk/Lib/fftpack/setup.py
   trunk/Lib/interpolate/setup.py
   trunk/Lib/odr/setup.py
   trunk/Lib/stats/setup.py
   trunk/Lib/weave/setup.py
Log:
cosmetic cleanup to make setup.py imports more consistent


Modified: trunk/Lib/cluster/setup.py
===================================================================
--- trunk/Lib/cluster/setup.py	2007-05-15 09:31:55 UTC (rev 3001)
+++ trunk/Lib/cluster/setup.py	2007-05-15 09:41:19 UTC (rev 3002)
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
-import os
-join = os.path.join
+from os.path import join
 
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration

Modified: trunk/Lib/fftpack/setup.py
===================================================================
--- trunk/Lib/fftpack/setup.py	2007-05-15 09:31:55 UTC (rev 3001)
+++ trunk/Lib/fftpack/setup.py	2007-05-15 09:41:19 UTC (rev 3002)
@@ -1,8 +1,7 @@
 #!/usr/bin/env python
 # Created by Pearu Peterson, August 2002
 
-import os
-join = os.path.join
+from os.path import join
 
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration

Modified: trunk/Lib/interpolate/setup.py
===================================================================
--- trunk/Lib/interpolate/setup.py	2007-05-15 09:31:55 UTC (rev 3001)
+++ trunk/Lib/interpolate/setup.py	2007-05-15 09:41:19 UTC (rev 3002)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import os
+from os.path import join
 
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
@@ -8,7 +8,7 @@
     config = Configuration('interpolate', parent_package, top_path)
 
     config.add_library('fitpack',
-                       sources=[os.path.join('fitpack', '*.f')],
+                       sources=[join('fitpack', '*.f')],
                       )
 
     config.add_extension('_fitpack',

Modified: trunk/Lib/odr/setup.py
===================================================================
--- trunk/Lib/odr/setup.py	2007-05-15 09:31:55 UTC (rev 3001)
+++ trunk/Lib/odr/setup.py	2007-05-15 09:41:19 UTC (rev 3002)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import os,sys,re
+from os.path import join
 from distutils import dep_util
 from glob import glob
 import warnings
@@ -26,7 +26,7 @@
         warnings.warn(BlasNotFoundError.__doc__)
         libodr_files.append('d_lpkbls.f')
 
-    libodr = [os.path.join('odrpack', x) for x in libodr_files]
+    libodr = [join('odrpack', x) for x in libodr_files]
     config.add_library('odrpack', sources=libodr)
     sources = ['__odrpack.c']
     libraries = ['odrpack'] + blas_info.pop('libraries', [])

Modified: trunk/Lib/stats/setup.py
===================================================================
--- trunk/Lib/stats/setup.py	2007-05-15 09:31:55 UTC (rev 3001)
+++ trunk/Lib/stats/setup.py	2007-05-15 09:41:19 UTC (rev 3002)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import os
+from os.path import join
 
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
@@ -9,7 +9,7 @@
     config.add_data_dir('tests')
 
     config.add_library('statlib',
-                       sources=[os.path.join('statlib', '*.f')])
+                       sources=[join('statlib', '*.f')])
 
     # add statlib module
     config.add_extension('statlib',

Modified: trunk/Lib/weave/setup.py
===================================================================
--- trunk/Lib/weave/setup.py	2007-05-15 09:31:55 UTC (rev 3001)
+++ trunk/Lib/weave/setup.py	2007-05-15 09:41:19 UTC (rev 3002)
@@ -1,11 +1,13 @@
 #!/usr/bin/env python
-import os
+
+from os.path import join
+
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
     config = Configuration('weave',parent_package,top_path)
     config.add_data_dir('tests')
     config.add_data_dir('scxx')
-    config.add_data_dir(os.path.join('blitz','blitz'))
+    config.add_data_dir(join('blitz','blitz'))
     config.add_data_dir('doc')
     config.add_data_dir('examples')
     return config