Clean up setup() calls.

17 files changed, 19 insertions, 17 deletions

diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index 458d19a41..bffd5b279 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -330,4 +330,5 @@ int main(int argc, char **argv)
 
 if __name__=='__main__':
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
+
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index 4dfe49d46..e5f26605a 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -530,9 +530,10 @@ class Configuration(object):
         caller_frame = get_frame(caller_level)
         caller_name = eval('__name__',caller_frame.f_globals,caller_frame.f_locals)
         self.local_path = get_path(caller_name, top_path)
+        # local_path -- directory of a file (usually setup.py) that
+        #               defines a configuration() function.
         if top_path is None:
             top_path = self.local_path
-            self.local_path = '.'
         if package_path is None:
             package_path = self.local_path
         elif os.path.isdir(njoin(self.local_path,package_path)):
diff --git a/numpy/distutils/setup.py b/numpy/distutils/setup.py
index f26cf89af..b16225f41 100644
--- a/numpy/distutils/setup.py
+++ b/numpy/distutils/setup.py
@@ -12,4 +12,4 @@ def configuration(parent_package='',top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core      import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/distutils/tests/f2py_ext/setup.py b/numpy/distutils/tests/f2py_ext/setup.py
index ed369bc6c..e3dfddb74 100644
--- a/numpy/distutils/tests/f2py_ext/setup.py
+++ b/numpy/distutils/tests/f2py_ext/setup.py
@@ -8,4 +8,4 @@ def configuration(parent_package='',top_path=None):
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/distutils/tests/f2py_f90_ext/setup.py b/numpy/distutils/tests/f2py_f90_ext/setup.py
index 7183d2192..ee56cc3a6 100644
--- a/numpy/distutils/tests/f2py_f90_ext/setup.py
+++ b/numpy/distutils/tests/f2py_f90_ext/setup.py
@@ -13,4 +13,4 @@ def configuration(parent_package='',top_path=None):
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/distutils/tests/gen_ext/setup.py b/numpy/distutils/tests/gen_ext/setup.py
index d5f2fa971..bf029062c 100644
--- a/numpy/distutils/tests/gen_ext/setup.py
+++ b/numpy/distutils/tests/gen_ext/setup.py
@@ -44,4 +44,4 @@ def configuration(parent_package='',top_path=None):
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/distutils/tests/pyrex_ext/setup.py b/numpy/distutils/tests/pyrex_ext/setup.py
index 0a8186e3f..5b348b916 100644
--- a/numpy/distutils/tests/pyrex_ext/setup.py
+++ b/numpy/distutils/tests/pyrex_ext/setup.py
@@ -9,4 +9,4 @@ def configuration(parent_package='',top_path=None):
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/distutils/tests/setup.py b/numpy/distutils/tests/setup.py
index 6aac6651c..89d73800e 100644
--- a/numpy/distutils/tests/setup.py
+++ b/numpy/distutils/tests/setup.py
@@ -11,4 +11,4 @@ def configuration(parent_package='',top_path=None):
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/distutils/tests/swig_ext/setup.py b/numpy/distutils/tests/swig_ext/setup.py
index fffd858e0..7f0dbe627 100644
--- a/numpy/distutils/tests/swig_ext/setup.py
+++ b/numpy/distutils/tests/swig_ext/setup.py
@@ -15,4 +15,4 @@ def configuration(parent_package='',top_path=None):
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/f2py/tests/array_from_pyobj/setup.py b/numpy/f2py/tests/array_from_pyobj/setup.py
index bcb083180..520e3dd94 100644
--- a/numpy/f2py/tests/array_from_pyobj/setup.py
+++ b/numpy/f2py/tests/array_from_pyobj/setup.py
@@ -22,4 +22,4 @@ def configuration(parent_name='',top_path=None):
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/fft/setup.py b/numpy/fft/setup.py
index 82763b70a..6acad7c9a 100644
--- a/numpy/fft/setup.py
+++ b/numpy/fft/setup.py
@@ -16,4 +16,4 @@ def configuration(parent_package='',top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/lib/setup.py b/numpy/lib/setup.py
index ca228ceef..f43843ddc 100644
--- a/numpy/lib/setup.py
+++ b/numpy/lib/setup.py
@@ -18,4 +18,4 @@ def configuration(parent_package='',top_path=None):
 
 if __name__=='__main__':
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/linalg/setup.py b/numpy/linalg/setup.py
index eeb83a94e..a41126a08 100644
--- a/numpy/linalg/setup.py
+++ b/numpy/linalg/setup.py
@@ -28,4 +28,4 @@ def configuration(parent_package='',top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/numarray/setup.py b/numpy/numarray/setup.py
index 056232d4b..c936400a1 100644
--- a/numpy/numarray/setup.py
+++ b/numpy/numarray/setup.py
@@ -15,4 +15,4 @@ def configuration(parent_package='',top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/oldnumeric/setup.py b/numpy/oldnumeric/setup.py
index 9526e51b4..82e8a6201 100644
--- a/numpy/oldnumeric/setup.py
+++ b/numpy/oldnumeric/setup.py
@@ -5,4 +5,4 @@ def configuration(parent_package='',top_path=None):
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/random/setup.py b/numpy/random/setup.py
index bf49a768f..6525034a8 100644
--- a/numpy/random/setup.py
+++ b/numpy/random/setup.py
@@ -50,4 +50,4 @@ int main(int argc, char *argv[])
 
 if __name__ == '__main__':
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='').todict())
+    setup(configuration=configuration)
diff --git a/numpy/testing/setup.py b/numpy/testing/setup.py
index e84dcb292..ad248d27f 100755
--- a/numpy/testing/setup.py
+++ b/numpy/testing/setup.py
@@ -12,5 +12,5 @@ if __name__ == '__main__':
           description = "NumPy test module",
           url = "http://www.numpy.org",
           license = "NumPy License (BSD Style)",
-          **configuration(top_path='').todict()
+          configuration = configuration,
           )