Changeset 99

Show
Ignore:
Timestamp:
Tue Sep 19 10:31:42 2006
Author:
jpellerin
Message:

Updated ez_setup to 0.6c2. Fixed 2.5 compatibility bug in nose.utils.test_address.

Files:

Legend:

Unmodified
Added
Removed
Modified

  • trunk/nose/util.py

    r78 r99  
    159 159         # regular unittest.TestCase  
    160 160         cls_adr = test_address(test.__class__)  
      161         # 2.5 compat: __testMethodName changed to _testMethodName  
      162         try:  
      163             method_name = test._TestCase__testMethodName  
      164         except AttributeError:  
      165             method_name = test._testMethodName  
    161 166         return (cls_adr[0], cls_adr[1],  
    162                   "%s.%s" % (cls_adr[2], test._TestCase__testMethodName))  
      167                 "%s.%s" % (cls_adr[2], method_name))  
    162 167     raise TypeError("I don't know what %s is (%s)" % (test, t))  
    163 168  

  • trunk/ez_setup.py

    r9 r99  
    15 15 """  
    16 16 import sys  
    17   DEFAULT_VERSION = "0.6a10"  
      17 DEFAULT_VERSION = "0.6c2"  
    17 17 DEFAULT_URL     = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3]  
    18 18  
    19 19 md5_data = {  
    20       'setuptools-0.5a13-py2.3.egg': '85edcf0ef39bab66e130d3f38f578c86',  
    21       'setuptools-0.5a13-py2.4.egg': 'ede4be600e3890e06d4ee5e0148e092a',  
    22       'setuptools-0.6a1-py2.3.egg': 'ee819a13b924d9696b0d6ca6d1c5833d',  
    23       'setuptools-0.6a1-py2.4.egg': '8256b5f1cd9e348ea6877b5ddd56257d',  
    24       'setuptools-0.6a10-py2.3.egg': '162d8357f1aff2b0349c6c247ee62987',  
    25       'setuptools-0.6a10-py2.4.egg': '803a2d8db501c1ac3b5b6fb4e907f788',  
    26       'setuptools-0.6a10dev_r42346-py2.3.egg': 'a7899272cfceb6aa60094ae8928b8077',  
    27       'setuptools-0.6a10dev_r42346-py2.4.egg': '5d42a64adca9aedb409f83ecf22156a5',  
    28       'setuptools-0.6a2-py2.3.egg': 'b98da449da411267c37a738f0ab625ba',  
    29       'setuptools-0.6a2-py2.4.egg': 'be5b88bc30aed63fdefd2683be135c3b',  
    30       'setuptools-0.6a3-py2.3.egg': 'ee0e325de78f23aab79d33106dc2a8c8',  
    31       'setuptools-0.6a3-py2.4.egg': 'd95453d525a456d6c23e7a5eea89a063',  
    32       'setuptools-0.6a4-py2.3.egg': 'e958cbed4623bbf47dd1f268b99d7784',  
    33       'setuptools-0.6a4-py2.4.egg': '7f33c3ac2ef1296f0ab4fac1de4767d8',  
    34       'setuptools-0.6a5-py2.3.egg': '748408389c49bcd2d84f6ae0b01695b1',  
    35       'setuptools-0.6a5-py2.4.egg': '999bacde623f4284bfb3ea77941d2627',  
    36       'setuptools-0.6a6-py2.3.egg': '7858139f06ed0600b0d9383f36aca24c',  
    37       'setuptools-0.6a6-py2.4.egg': 'c10d20d29acebce0dc76219dc578d058',  
    38       'setuptools-0.6a7-py2.3.egg': 'cfc4125ddb95c07f9500adc5d6abef6f',  
    39       'setuptools-0.6a7-py2.4.egg': 'c6d62dab4461f71aed943caea89e6f20',  
    40       'setuptools-0.6a8-py2.3.egg': '2f18eaaa3f544f5543ead4a68f3b2e1a',  
    41       'setuptools-0.6a8-py2.4.egg': '799018f2894f14c9f8bcb2b34e69b391',  
    42       'setuptools-0.6a9-py2.3.egg': '8e438ad70438b07b0d8f82cae42b278f',  
    43       'setuptools-0.6a9-py2.4.egg': '8f6e01fc12fb1cd006dc0d6c04327ec1',  
      20     'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca',  
      21     'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb',  
      22     'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b',  
      23     'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a',  
      24     'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618',  
      25     'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac',  
      26     'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5',  
      27     'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4',  
      28     'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c',  
      29     'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b',  
      30     'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27',  
      31     'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277',  
    44 32 }  
    45 33  
    …… 
    57 45             )  
    58 46             sys.exit(2)  
    59       return data     
      47     return data  
    59 47  
    60 48  
    …… 
    73 61     should one be required.  If an older version of setuptools is installed,  
    74 62     this routine will print a message to ``sys.stderr`` and raise SystemExit in  
    75       an attempt to abort the calling script.   
      63     an attempt to abort the calling script.  
    75 63     """  
    76 64     try:  
    …… 
    92 80         pkg_resources.require("setuptools>="+version)  
    93 81  
    94       except pkg_resources.VersionConflict:  
      82     except pkg_resources.VersionConflict, e:  
    94 82         # XXX could we install in a subprocess here?  
    95 83         print >>sys.stderr, (  
    96 84             "The required version of setuptools (>=%s) is not available, and\n"  
    97 85             "can't be installed while this script is running. Please install\n"  
    98               " a more recent version first."  
    99           ) % version  
      86             " a more recent version first.\n\n(Currently using %r)"  
      87         ) % (version, e.args[0])  
    100 88         sys.exit(2)  
    101 89  
    …… 
    154 142         import setuptools  
    155 143     except ImportError:  
    156           import tempfile, shutil  
    157           tmpdir = tempfile.mkdtemp(prefix="easy_install-")  
      144         egg = None  
    158 145         try:  
    159               egg = download_setuptools(version, to_dir=tmpdir, delay=0)  
      146             egg = download_setuptools(version, delay=0)  
    159 146             sys.path.insert(0,egg)  
    160 147             from setuptools.command.easy_install import main  
    161               main(list(argv)+[egg])  
      148             return main(list(argv)+[egg])   # we're done here  
    161 148         finally:  
    162               shutil.rmtree(tmpdir)  
      149             if egg and os.path.exists(egg):  
      150                 os.unlink(egg)  
    163 151     else:  
    164 152         if setuptools.__version__ == '0.0.1':  
    …… 
    188 176  
    189 177  
    190                
      178  
    190 178 def update_md5(filenames):  
    191 179     """Update our built-in md5 registry"""  
    …… 
    197 185     for name in filenames:  
    198 186         base = os.path.basename(name)  
    199           f = open(name,'rb')         
      187         f = open(name,'rb')  
    199 187         md5_data[base] = md5(f.read()).hexdigest()  
    200 188         f.close()