aboutsummaryrefslogtreecommitdiffstats
path: root/ez_setup.py
diff options
context:
space:
mode:
Diffstat (limited to 'ez_setup.py')
-rwxr-xr-xez_setup.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ez_setup.py b/ez_setup.py
index d0c98b14..4efc388a 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -132,7 +132,7 @@ def main(argv, version=DEFAULT_VERSION):
try:
egg = download_setuptools(version, to_dir=tmpdir)
sys.path.insert(0,egg)
- from easy_install import main
+ from setuptools.command.easy_install import main
main(list(argv)+[egg])
finally:
shutil.rmtree(tmpdir)
@@ -146,12 +146,12 @@ def main(argv, version=DEFAULT_VERSION):
try:
pkg_resources.require(req)
except pkg_resources.VersionConflict:
- from easy_install import main
+ from setuptools.command.easy_install import main
main(list(argv)+[req])
sys.exit(0) # try to force an exit
else:
if argv:
- from easy_install import main
+ from setuptools.command.easy_install import main
main(argv)
else:
print "Setuptools successfully installed or upgraded."