diff options
| author | Pearu Peterson <pearu.peterson@gmail.com> | 2006-03-29 11:22:07 +0000 |
|---|---|---|
| committer | Pearu Peterson <pearu.peterson@gmail.com> | 2006-03-29 11:22:07 +0000 |
| commit | cecd918ce6c4665e4f2361fa64e076c35d3cfae4 (patch) | |
| tree | 4e71a5bb664941cf2060c3e6500660468293a5fe /numpy/distutils/misc_util.py | |
| parent | 700d45ec7abfc06bc1360e008b2328d5f95c7909 (diff) | |
| download | numpy-cecd918ce6c4665e4f2361fa64e076c35d3cfae4.tar.gz | |
Forcing unique names for subpackage setup.py modules.
Diffstat (limited to 'numpy/distutils/misc_util.py')
| -rw-r--r-- | numpy/distutils/misc_util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 329ffde79..00cf328c2 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -520,11 +520,12 @@ class Configuration(object): try: fo_setup_py = open(setup_py, 'U') setup_name = os.path.splitext(os.path.basename(setup_py))[0] - n = dot_join(self.name,setup_name) + n = dot_join(self.name,subpackage_name,setup_name) setup_module = imp.load_module('_'.join(n.split('.')), fo_setup_py, setup_py, ('.py', 'U', 1)) + fo_setup_py.close() if not hasattr(setup_module,'configuration'): if not self.options['assume_default_configuration']: self.warn('Assuming default configuration '\ @@ -568,7 +569,6 @@ class Configuration(object): if not os.path.isfile(setup_py): setup_py = njoin(subpackage_path, 'setup_%s.py' % (subpackage_name)) - if not os.path.isfile(setup_py): if not self.options['assume_default_configuration']: self.warn('Assuming default configuration '\ |