|
14 | 14 | This file can also be run as a script to install or upgrade setuptools.
|
15 | 15 | """
|
16 | 16 | import sys
|
17 |
| -DEFAULT_VERSION = "0.6c9" |
| 17 | +DEFAULT_VERSION = "0.6c11" |
18 | 18 | DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
|
19 | 19 |
|
20 | 20 | md5_data = {
|
|
28 | 28 | 'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
|
29 | 29 | 'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
|
30 | 30 | 'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
|
| 31 | + 'setuptools-0.6c10-py2.3.egg': 'ce1e2ab5d3a0256456d9fc13800a7090', |
| 32 | + 'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4', |
| 33 | + 'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7', |
| 34 | + 'setuptools-0.6c10-py2.6.egg': '58ea40aef06da02ce641495523a0b7f5', |
| 35 | + 'setuptools-0.6c11-py2.3.egg': '2baeac6e13d414a9d28e7ba5b5a596de', |
| 36 | + 'setuptools-0.6c11-py2.4.egg': 'bd639f9b0eac4c42497034dec2ec0c2b', |
| 37 | + 'setuptools-0.6c11-py2.5.egg': '64c94f3bf7a72a13ec83e0b24f2749b2', |
| 38 | + 'setuptools-0.6c11-py2.6.egg': 'bfa92100bd772d5a213eedd356d64086', |
31 | 39 | 'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',
|
32 | 40 | 'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',
|
33 | 41 | 'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa',
|
@@ -104,11 +112,11 @@ def do_download():
|
104 | 112 | "\n\n(Currently using %r)"
|
105 | 113 | ) % (version, e.args[0])
|
106 | 114 | sys.exit(2)
|
107 |
| - else: |
108 |
| - del pkg_resources, sys.modules['pkg_resources'] # reload ok |
109 |
| - return do_download() |
110 | 115 | except pkg_resources.DistributionNotFound:
|
111 |
| - return do_download() |
| 116 | + pass |
| 117 | + |
| 118 | + del pkg_resources, sys.modules['pkg_resources'] # reload ok |
| 119 | + return do_download() |
112 | 120 |
|
113 | 121 | def download_setuptools(
|
114 | 122 | version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir,
|
|
0 commit comments