From: Zooko O'Whielacronx zooko@zooko.com Date: Tue, 1 May 2007 00:56:43 +0000 (+0530) Subject: zfec: complete the removal of the 15-second delay when downloading setuptools X-Git-Url: https://git.rkrishnan.org/pf/content/en/seg/?a=commitdiff_plain;h=af410fbeebcaa0d27b6d142dc1c3aab40bd5fc48;p=tahoe-lafs%2Fzfec.git zfec: complete the removal of the 15-second delay when downloading setuptools darcs-hash:387c63aee7effec760723155a7c74329a48e3348 --- diff --git a/zfec/ez_setup.py b/zfec/ez_setup.py index 0a812bd..aa87786 100755 --- a/zfec/ez_setup.py +++ b/zfec/ez_setup.py @@ -58,17 +58,14 @@ def _validate_md5(egg_name, data): def use_setuptools( - version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, - download_delay=15 + version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir ): """Automatically find/download setuptools and make it available on sys.path `version` should be a valid setuptools version number that is available as an egg for download under the `download_base` URL (which should end with a '/'). `to_dir` is the directory where setuptools will be downloaded, if - it is not already available. If `download_delay` is specified, it should - be the number of seconds that will be paused before initiating a download, - should one be required. If an older version of setuptools is installed, + it is not already available. If an older version of setuptools is installed, this routine will print a message to ``sys.stderr`` and raise SystemExit in an attempt to abort the calling script. """ @@ -81,7 +78,7 @@ def use_setuptools( ) sys.exit(2) except ImportError: - egg = download_setuptools(version, download_base, to_dir, download_delay) + egg = download_setuptools(version, download_base, to_dir) sys.path.insert(0, egg) import setuptools; setuptools.bootstrap_install_from = egg @@ -106,7 +103,6 @@ def download_setuptools( `version` should be a valid setuptools version number that is available as an egg for download under the `download_base` URL (which should end with a '/'). `to_dir` is the directory where the egg will be downloaded. - `delay` is the number of seconds to pause before an actual download attempt. """ import urllib2, shutil egg_name = "setuptools-%s-py%s.egg" % (version,sys.version[:3]) @@ -151,7 +147,7 @@ def main(argv, version=DEFAULT_VERSION): except ImportError: egg = None try: - egg = download_setuptools(version, delay=0) + egg = download_setuptools(version) sys.path.insert(0,egg) from setuptools.command.easy_install import main return main(list(argv)+[egg]) # we're done here @@ -172,7 +168,7 @@ def main(argv, version=DEFAULT_VERSION): from setuptools.command.easy_install import main except ImportError: from easy_install import main - main(list(argv)+[download_setuptools(delay=0)]) + main(list(argv)+[download_setuptools()]) sys.exit(0) # try to force an exit else: if argv: