diff options
| author | PJ Eby <distutils-sig@python.org> | 2007-08-24 03:38:27 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2007-08-24 03:38:27 +0000 |
| commit | 996980750968d02c921bcfd33562969e97573ed9 (patch) | |
| tree | f6bf66012600d9add15df9ffb7ede3ce436d9953 | |
| parent | ab69c26ccc5d8c178f3f6d7d1c7e52ab7a47d179 (diff) | |
| download | external_python_setuptools-996980750968d02c921bcfd33562969e97573ed9.tar.gz external_python_setuptools-996980750968d02c921bcfd33562969e97573ed9.tar.bz2 external_python_setuptools-996980750968d02c921bcfd33562969e97573ed9.zip | |
``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
| -rwxr-xr-x | EasyInstall.txt | 3 | ||||
| -rw-r--r-- | setuptools/__init__.py | 2 | ||||
| -rwxr-xr-x | setuptools/package_index.py | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/EasyInstall.txt b/EasyInstall.txt index 1e7971d8..404789c4 100755 --- a/EasyInstall.txt +++ b/EasyInstall.txt @@ -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. diff --git a/setuptools/__init__.py b/setuptools/__init__.py index 983d25f2..acb9013e 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -80,5 +80,3 @@ import distutils.filelist distutils.filelist.findall = findall # fix findall bug in distutils. - - diff --git a/setuptools/package_index.py b/setuptools/package_index.py index 3da253a5..d558b648 100755 --- a/setuptools/package_index.py +++ b/setuptools/package_index.py @@ -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""" |