Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #2398 -- Updated ez_setup.py to version 0.6c1

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3432 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 6d050ff07a548d5de524f89012b2743242f339fc 1 parent 564d556
Adrian Holovaty authored July 23, 2006

Showing 1 changed file with 16 additions and 30 deletions. Show diff stats Hide diff stats

  1. 46  ez_setup.py
46  ez_setup.py
@@ -14,34 +14,20 @@
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.6a10"
  17
+DEFAULT_VERSION = "0.6c1"
18 18
 DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]
19 19
 
20 20
 md5_data = {
21  
-    'setuptools-0.5a13-py2.3.egg': '85edcf0ef39bab66e130d3f38f578c86',
22  
-    'setuptools-0.5a13-py2.4.egg': 'ede4be600e3890e06d4ee5e0148e092a',
23  
-    'setuptools-0.6a1-py2.3.egg': 'ee819a13b924d9696b0d6ca6d1c5833d',
24  
-    'setuptools-0.6a1-py2.4.egg': '8256b5f1cd9e348ea6877b5ddd56257d',
25  
-    'setuptools-0.6a10-py2.3.egg': '162d8357f1aff2b0349c6c247ee62987',
26  
-    'setuptools-0.6a10-py2.4.egg': '803a2d8db501c1ac3b5b6fb4e907f788',
27  
-    'setuptools-0.6a10dev_r42346-py2.3.egg': 'a7899272cfceb6aa60094ae8928b8077',
28  
-    'setuptools-0.6a10dev_r42346-py2.4.egg': '5d42a64adca9aedb409f83ecf22156a5',
29  
-    'setuptools-0.6a2-py2.3.egg': 'b98da449da411267c37a738f0ab625ba',
30  
-    'setuptools-0.6a2-py2.4.egg': 'be5b88bc30aed63fdefd2683be135c3b',
31  
-    'setuptools-0.6a3-py2.3.egg': 'ee0e325de78f23aab79d33106dc2a8c8',
32  
-    'setuptools-0.6a3-py2.4.egg': 'd95453d525a456d6c23e7a5eea89a063',
33  
-    'setuptools-0.6a4-py2.3.egg': 'e958cbed4623bbf47dd1f268b99d7784',
34  
-    'setuptools-0.6a4-py2.4.egg': '7f33c3ac2ef1296f0ab4fac1de4767d8',
35  
-    'setuptools-0.6a5-py2.3.egg': '748408389c49bcd2d84f6ae0b01695b1',
36  
-    'setuptools-0.6a5-py2.4.egg': '999bacde623f4284bfb3ea77941d2627',
37  
-    'setuptools-0.6a6-py2.3.egg': '7858139f06ed0600b0d9383f36aca24c',
38  
-    'setuptools-0.6a6-py2.4.egg': 'c10d20d29acebce0dc76219dc578d058',
39  
-    'setuptools-0.6a7-py2.3.egg': 'cfc4125ddb95c07f9500adc5d6abef6f',
40  
-    'setuptools-0.6a7-py2.4.egg': 'c6d62dab4461f71aed943caea89e6f20',
41  
-    'setuptools-0.6a8-py2.3.egg': '2f18eaaa3f544f5543ead4a68f3b2e1a',
42  
-    'setuptools-0.6a8-py2.4.egg': '799018f2894f14c9f8bcb2b34e69b391',
43  
-    'setuptools-0.6a9-py2.3.egg': '8e438ad70438b07b0d8f82cae42b278f',
44  
-    'setuptools-0.6a9-py2.4.egg': '8f6e01fc12fb1cd006dc0d6c04327ec1',
  21
+    'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',
  22
+    'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',
  23
+    'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',
  24
+    'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',
  25
+    'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',
  26
+    'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',
  27
+    'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',
  28
+    'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',
  29
+    'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',
  30
+    'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',
45 31
 }
46 32
 
47 33
 import sys, os
@@ -56,7 +42,7 @@ def _validate_md5(egg_name, data):
56 42
                 % egg_name
57 43
             )
58 44
             sys.exit(2)
59  
-    return data    
  45
+    return data
60 46
 
61 47
 
62 48
 def use_setuptools(
@@ -72,7 +58,7 @@ def use_setuptools(
72 58
     be the number of seconds that will be paused before initiating a download,
73 59
     should one be required.  If an older version of setuptools is installed,
74 60
     this routine will print a message to ``sys.stderr`` and raise SystemExit in
75  
-    an attempt to abort the calling script.  
  61
+    an attempt to abort the calling script.
76 62
     """
77 63
     try:
78 64
         import setuptools
@@ -159,7 +145,7 @@ def main(argv, version=DEFAULT_VERSION):
159 145
             egg = download_setuptools(version, to_dir=tmpdir, delay=0)
160 146
             sys.path.insert(0,egg)
161 147
             from setuptools.command.easy_install import main
162  
-            main(list(argv)+[egg])
  148
+            return main(list(argv)+[egg])   # we're done here
163 149
         finally:
164 150
             shutil.rmtree(tmpdir)
165 151
     else:
@@ -187,7 +173,7 @@ def main(argv, version=DEFAULT_VERSION):
187 173
             print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
188 174
 
189 175
 
190  
-            
  176
+
191 177
 def update_md5(filenames):
192 178
     """Update our built-in md5 registry"""
193 179
 
@@ -196,7 +182,7 @@ def update_md5(filenames):
196 182
 
197 183
     for name in filenames:
198 184
         base = os.path.basename(name)
199  
-        f = open(name,'rb')       
  185
+        f = open(name,'rb')
200 186
         md5_data[base] = md5(f.read()).hexdigest()
201 187
         f.close()
202 188
 

0 notes on commit 6d050ff

Please sign in to comment.
Something went wrong with that request. Please try again.