1. Tarek Ziadé
  2. distribute

Commits

phillip.eby  committed 1c2c456

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

  • Participants
  • Parent commits bd0921d
  • Branches setuptools-0.6

Comments (0)

Files changed (3)

File EasyInstall.txt

View file
  • Ignore whitespace
 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.

File setuptools/__init__.py

View file
  • Ignore whitespace
 distutils.filelist.findall = findall    # fix findall bug in distutils.
 
 
-
-

File setuptools/package_index.py

View file
  • Ignore whitespace
 
     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
 
 
 
-
 def open_with_auth(url):
     """Open a urllib2 request, handling HTTP authentication"""