diff options
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/command/__init__.py | 3 | ||||
| -rwxr-xr-x | setuptools/command/install_scripts.py | 5 |
2 files changed, 7 insertions, 1 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') diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py index b1186dba..ac797883 100755 --- a/setuptools/command/install_scripts.py +++ b/setuptools/command/install_scripts.py @@ -1,6 +1,5 @@ from distutils.command.install_scripts import install_scripts \ as _install_scripts -from easy_install import get_script_args, sys_executable, chmod from pkg_resources import Distribution, PathMetadata, ensure_directory import os from distutils import log @@ -13,6 +12,9 @@ class install_scripts(_install_scripts): self.no_ep = False def run(self): + from setuptools.command.easy_install import (get_script_args, + sys_executable) + self.run_command("egg_info") if self.distribution.scripts: _install_scripts.run(self) # run first to set up self.outfiles @@ -37,6 +39,7 @@ class install_scripts(_install_scripts): def write_script(self, script_name, contents, mode="t", *ignored): """Write an executable file to the scripts directory""" + from setuptools.command.easy_install import chmod log.info("Installing %s script to %s", script_name, self.install_dir) target = os.path.join(self.install_dir, script_name) self.outfiles.append(target) |