summaryrefslogtreecommitdiff
path: root/virtualenv_embedded/ez_setup.py
diff options
context:
space:
mode:
Diffstat (limited to 'virtualenv_embedded/ez_setup.py')
-rw-r--r--virtualenv_embedded/ez_setup.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/virtualenv_embedded/ez_setup.py b/virtualenv_embedded/ez_setup.py
index 5f6c740..b74adc0 100644
--- a/virtualenv_embedded/ez_setup.py
+++ b/virtualenv_embedded/ez_setup.py
@@ -103,8 +103,7 @@ def use_setuptools(
return do_download()
try:
pkg_resources.require("setuptools>="+version); return
- except pkg_resources.VersionConflict:
- e = sys.exc_info()[1]
+ except pkg_resources.VersionConflict, e:
if was_imported:
print >>sys.stderr, (
"The required version of setuptools (>=%s) is not available, and\n"
@@ -239,8 +238,8 @@ def main(argv, version=DEFAULT_VERSION):
from setuptools.command.easy_install import main
main(argv)
else:
- print("Setuptools version",version,"or greater has been installed.")
- print('(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)')
+ print "Setuptools version",version,"or greater has been installed."
+ print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
def update_md5(filenames):
"""Update our built-in md5 registry"""