diff options
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/command/__init__.py | 9 | ||||
| -rw-r--r-- | setuptools/dist.py | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py index 570e6957..b966dcea 100644 --- a/setuptools/command/__init__.py +++ b/setuptools/command/__init__.py @@ -1,15 +1,6 @@ -__all__ = [ - 'alias', 'bdist_egg', 'bdist_rpm', 'build_ext', 'build_py', 'develop', - 'easy_install', 'egg_info', 'install', 'install_lib', 'rotate', 'saveopts', - 'sdist', 'setopt', 'test', 'install_egg_info', 'install_scripts', - 'upload_docs', 'build_clib', 'dist_info', -] - from distutils.command.bdist import bdist import sys -from setuptools.command import install_scripts - if 'egg' not in bdist.format_commands: bdist.format_command['egg'] = ('bdist_egg', "Python .egg file") bdist.format_commands.append('egg') diff --git a/setuptools/dist.py b/setuptools/dist.py index 96c82409..a1b7e832 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -639,7 +639,7 @@ class Distribution(_Distribution): return opt underscore_opt = opt.replace('-', '_') - commands = distutils.command.__all__ + setuptools.command.__all__ + commands = distutils.command.__all__ + self._setuptools_commands() if (not section.startswith('options') and section != 'metadata' and section not in commands): return underscore_opt @@ -651,6 +651,14 @@ class Distribution(_Distribution): % (opt, underscore_opt)) return underscore_opt + def _setuptools_commands(self): + try: + dist = pkg_resources.get_distribution('setuptools') + return list(dist.get_entry_map('distutils.commands')) + except pkg_resources.DistributionNotFound: + # during bootstrapping, distribution doesn't exist + return [] + def make_option_lowercase(self, opt, section): if section != 'metadata' or opt.islower(): return opt |