corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 837631 - Part 1: Upgrade virtualenv to 1.8.4; r=glandium

Browse Source 
python/virtualenv now matches the upstream 1.8.4 release.
This commit is contained in:
Gregory Szorc
2013-02-04 09:33:30 -08:00
parent 955505b3ad
commit 764622dfce
15 changed files with 617 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python/virtualenv/virtualenv_embedded/ez_setup.py
View File

@@ -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"""