From 9fc8282b30e40eb2c02c3e7bd28be5156e109a5c Mon Sep 17 00:00:00 2001 From: tarek Date: Sun, 15 Nov 2009 00:16:38 +0100 Subject: 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 --- setuptools/command/install_scripts.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'setuptools/command/install_scripts.py') 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) -- cgit v1.2.1