Commit 99698075 authored by PJ Eby's avatar PJ Eby

``ftp:`` download URLs now work correctly. (backport from trunk)

--HG--
branch : setuptools-0.6
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4057371
parent ab69c26c
......@@ -1233,6 +1233,9 @@ displayed MD5 info (broken onto two lines for readability)::
Release Notes/Change History
============================
0.6c7
* ``ftp:`` download URLs now work correctly.
0.6c6
* EasyInstall no longer aborts the installation process if a URL it wants to
retrieve can't be downloaded, unless the URL is an actual package download.
......
......@@ -80,5 +80,3 @@ import distutils.filelist
distutils.filelist.findall = findall # fix findall bug in distutils.
......@@ -619,7 +619,7 @@ class PackageIndex(Environment):
def _attempt_download(self, url, filename):
headers = self._download_to(url, filename)
if 'html' in headers['content-type'].lower():
if 'html' in headers.get('content-type','').lower():
return self._download_html(url, headers, filename)
else:
return filename
......@@ -695,7 +695,6 @@ def htmldecode(text):
def open_with_auth(url):
"""Open a urllib2 request, handling HTTP authentication"""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment