aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xEasyInstall.txt3
-rwxr-xr-xsetuptools/package_index.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt
index ea16018e..541de858 100755
--- a/EasyInstall.txt
+++ b/EasyInstall.txt
@@ -1098,6 +1098,9 @@ Release Notes/Change History
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``.
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 2760dc8d..d13bfc0f 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -162,7 +162,7 @@ class PackageIndex(Environment):
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