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

[phillip.eby]

Author: phillip.eby
Date: Tue Jun 20 23:21:08 2006
New Revision: 47051

Modified:
   sandbox/branches/setuptools-0.6/EasyInstall.txt
   sandbox/branches/setuptools-0.6/setuptools/package_index.py
Log:
Fix ``ftp://`` directory listing URLs from causing a crash when used in 
the "Home page" or "Download URL" slots on PyPI.
(merged from the trunk)


Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/EasyInstall.txt	(original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt	Tue Jun 20 23:21:08 2006
@@ -1098,6 +1098,9 @@
 0.6b4
  * Fix creating Python wrappers for non-Python scripts
 
+ * Fix ``ftp://`` directory listing URLs from causing a crash when used in the
+   "Home page" or "Download URL" slots on PyPI.
+
 0.6b3
  * Fix local ``--find-links`` eggs not being copied except with
    ``--always-copy``.

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	Tue Jun 20 23:21:08 2006
@@ -162,7 +162,7 @@
         self.fetched_urls[url] = self.fetched_urls[f.url] = True
 
 
-        if 'html' not in f.headers['content-type'].lower():
+        if 'html' not in f.headers.get('content-type', '').lower():
             f.close()   # not html, we can't process it
             return