diff options
author | Georg Brandl <georg@python.org> | 2008-11-23 19:50:56 +0100 |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2008-11-23 19:50:56 +0100 |
commit | 7bd8c4accae8c563e20b2e59d8d8183d9c9319a3 (patch) | |
tree | 1f214d3f84bccc4a8342246147b66968791c9ceb | |
parent | 36ef80dc71a3b19cd17515b81b99b7d50e31f64a (diff) | |
download | sphinx-7bd8c4accae8c563e20b2e59d8d8183d9c9319a3.tar.gz |
Update ez_setup.py.
-rw-r--r-- | ez_setup.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ez_setup.py b/ez_setup.py index 89cf056d..d24e845e 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``. This file can also be run as a script to install or upgrade setuptools. """ import sys -DEFAULT_VERSION = "0.6c8" +DEFAULT_VERSION = "0.6c9" DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3] md5_data = { @@ -48,13 +48,18 @@ md5_data = { 'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902', 'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de', 'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b', + 'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03', + 'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a', + 'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6', + 'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a', } import sys, os +try: from hashlib import md5 +except ImportError: from md5 import md5 def _validate_md5(egg_name, data): if egg_name in md5_data: - from md5 import md5 digest = md5(data).hexdigest() if digest != md5_data[egg_name]: print >>sys.stderr, ( @@ -64,7 +69,6 @@ def _validate_md5(egg_name, data): sys.exit(2) return data - def use_setuptools( version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, download_delay=15 @@ -233,7 +237,6 @@ def update_md5(filenames): """Update our built-in md5 registry""" import re - from md5 import md5 for name in filenames: base = os.path.basename(name) @@ -270,3 +273,4 @@ if __name__=='__main__': + |