[Python-checkins] r57371 - in sandbox/branches/setuptools-0.6: EasyInstall.txt setuptools/__init__.py setuptools/package_index.py

[phillip.eby]

Author: phillip.eby
Date: Fri Aug 24 05:38:27 2007
New Revision: 57371

Modified:
   sandbox/branches/setuptools-0.6/EasyInstall.txt
   sandbox/branches/setuptools-0.6/setuptools/__init__.py
   sandbox/branches/setuptools-0.6/setuptools/package_index.py
Log:
``ftp:`` download URLs now work correctly. (backport from trunk)


Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/EasyInstall.txt	(original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt	Fri Aug 24 05:38:27 2007
@@ -1233,6 +1233,9 @@
 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.

Modified: sandbox/branches/setuptools-0.6/setuptools/__init__.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/__init__.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/__init__.py	Fri Aug 24 05:38:27 2007
@@ -80,5 +80,3 @@
 distutils.filelist.findall = findall    # fix findall bug in distutils.
 
 
-
-

Modified: sandbox/branches/setuptools-0.6/setuptools/package_index.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/package_index.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/package_index.py	Fri Aug 24 05:38:27 2007
@@ -619,7 +619,7 @@
 
     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 open_with_auth(url):
     """Open a urllib2 request, handling HTTP authentication"""