diff options
Diffstat (limited to 'numpy/distutils/misc_util.py')
| -rw-r--r-- | numpy/distutils/misc_util.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 11992374a..488e0fc8e 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -538,6 +538,8 @@ class Configuration(object): self.local_path = get_path_from_frame(caller_frame, top_path) # local_path -- directory of a file (usually setup.py) that # defines a configuration() function. + # local_path -- directory of a file (usually setup.py) that + # defines a configuration() function. if top_path is None: top_path = self.local_path if package_path is None: @@ -638,18 +640,8 @@ class Configuration(object): raise ValueError,'Unknown option: '+key def get_distribution(self): - import distutils.core - dist = distutils.core._setup_distribution - # XXX Hack to get numpy installable with easy_install. - # The problem is easy_install runs it's own setup(), which - # sets up distutils.core._setup_distribution. However, - # when our setup() runs, that gets overwritten and lost. - # We can't use isinstance, as the DistributionWithoutHelpCommands - # class is local to a function in setuptools.command.easy_install - if dist is not None and \ - repr(dist).find('DistributionWithoutHelpCommands') != -1: - return None - return dist + from numpy.distutils.core import get_distribution + return get_distribution() def _wildcard_get_subpackage(self, subpackage_name, parent_name, |