diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-25 14:32:23 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-25 14:32:23 -0400 |
commit | cc51ff77f4914497a98b7223723995f05e8ab1a1 (patch) | |
tree | 7265273188ac0d0f3bee79beedccc9a9d3ad125b /setuptools/package_index.py | |
parent | 59d45d94058826e754c7f36fe0605ab9e1160b62 (diff) | |
download | external_python_setuptools-cc51ff77f4914497a98b7223723995f05e8ab1a1.tar.gz external_python_setuptools-cc51ff77f4914497a98b7223723995f05e8ab1a1.tar.bz2 external_python_setuptools-cc51ff77f4914497a98b7223723995f05e8ab1a1.zip |
Fix use of getheaders on Python 3
Diffstat (limited to 'setuptools/package_index.py')
-rwxr-xr-x | setuptools/package_index.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 8a3c96de..133677e8 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -13,6 +13,7 @@ except ImportError: from md5 import md5 from fnmatch import translate from .py24compat import wraps +from setuptools.py27compat import get_all_headers EGG_FRAGMENT = re.compile(r'^egg=([-A-Za-z0-9_.]+)$') HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I) @@ -608,10 +609,8 @@ class PackageIndex(Environment): size = -1 if "content-length" in headers: # Some servers return multiple Content-Length headers :( - if not hasattr(headers, 'get_all'): - # Older versions of Python don't have the get_all method - headers.get_all = headers.getheaders - size = max(map(int,headers.get_all("Content-Length"))) + sizes = get_all_headers(headers, 'Content-Length') + size = max(map(int, sizes)) self.reporthook(url, filename, blocknum, bs, size) tfp = open(filename,'wb') while True: |