diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-25 15:29:32 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-25 15:29:32 -0400 |
| commit | 15ec728e9673000db2fca0c5407f2001ad15f97f (patch) | |
| tree | dbce515aa8c9d9b0cb7acb084de02d31823fcf2a | |
| parent | cc51ff77f4914497a98b7223723995f05e8ab1a1 (diff) | |
| parent | c12b3db412210faa982134dce22b5e6ddad31bba (diff) | |
| download | external_python_setuptools-15ec728e9673000db2fca0c5407f2001ad15f97f.tar.gz external_python_setuptools-15ec728e9673000db2fca0c5407f2001ad15f97f.tar.bz2 external_python_setuptools-15ec728e9673000db2fca0c5407f2001ad15f97f.zip | |
Merge with Distribute 0.6.43
--HG--
rename : distribute_setup.py => ez_setup.py
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | CHANGES.txt | 6 | ||||
| -rwxr-xr-x | setuptools/package_index.py | 2 |
3 files changed, 8 insertions, 1 deletions
@@ -54,3 +54,4 @@ d737b2039c5f92af8000f78bbc80b6a5183caa97 0.6.39 ad107e9b4beea24516ac4e1e854696e586fe279d 0.6.41 f30167716b659f96c5e0b7ea3d5be2bcff8c0eac 0.6.42 8951daac6c1bc7b24c7fb054fd369f2c5b88cdb3 0.7b2 +35086ee286732b0f63d2be18d9f26f2734586e2d 0.6.43 diff --git a/CHANGES.txt b/CHANGES.txt index 614a8489..9796fd59 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -21,6 +21,12 @@ Added several features that were slated for setuptools 0.6c12: an HTTPS service. ------ +0.6.43 +------ + +* Issue #378: Restore support for Python 2.4 Syntax (regression in 0.6.42). + +------ 0.6.42 ------ diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 133677e8..4f39c70a 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -12,7 +12,7 @@ try: except ImportError: from md5 import md5 from fnmatch import translate -from .py24compat import wraps +from setuptools.py24compat import wraps from setuptools.py27compat import get_all_headers EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$') |