diff options
| author | tarek <none@none> | 2009-11-15 00:16:38 +0100 |
|---|---|---|
| committer | tarek <none@none> | 2009-11-15 00:16:38 +0100 |
| commit | 9fc8282b30e40eb2c02c3e7bd28be5156e109a5c (patch) | |
| tree | 49dce4de387af5f3350124dbfdb785bb20257b91 /setuptools/command/__init__.py | |
| parent | 4f06b3cc70d5a1457c0a158b3a2f1be1c4ea851c (diff) | |
| download | external_python_setuptools-9fc8282b30e40eb2c02c3e7bd28be5156e109a5c.tar.gz external_python_setuptools-9fc8282b30e40eb2c02c3e7bd28be5156e109a5c.tar.bz2 external_python_setuptools-9fc8282b30e40eb2c02c3e7bd28be5156e109a5c.zip | |
Fixed #80: test_develop fails with Python 3.1. I don't understand why the module is shadowed at this stage, but importing it fixes the problem.
--HG--
branch : distribute
extra : rebase_source : 9cbb38022787d08f0c8399e25829b10286fb655d
Diffstat (limited to 'setuptools/command/__init__.py')
| -rw-r--r-- | setuptools/command/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/setuptools/command/__init__.py b/setuptools/command/__init__.py index ea544b50..d608871e 100644 --- a/setuptools/command/__init__.py +++ b/setuptools/command/__init__.py @@ -5,13 +5,16 @@ __all__ = [ 'register', 'bdist_wininst', 'upload_docs', ] +from setuptools.command.install_scripts import install_scripts import sys + if sys.version>='2.5': # In Python 2.5 and above, distutils includes its own upload command __all__.remove('upload') from distutils.command.bdist import bdist + if 'egg' not in bdist.format_commands: bdist.format_command['egg'] = ('bdist_egg', "Python .egg file") bdist.format_commands.append('egg') |