aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/package_index.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2010-02-01 16:42:04 +0000
committerPJ Eby <distutils-sig@python.org>2010-02-01 16:42:04 +0000
commit16dc2a11fb1b33955ad55ab00f186fcc909e35f6 (patch)
tree27b1857edf715c66aeef994b269c33d62730e715 /setuptools/package_index.py
parent4478cdc28c1550f64b7918e3d88af08d0c28a0cb (diff)
downloadexternal_python_setuptools-16dc2a11fb1b33955ad55ab00f186fcc909e35f6.tar.gz
external_python_setuptools-16dc2a11fb1b33955ad55ab00f186fcc909e35f6.tar.bz2
external_python_setuptools-16dc2a11fb1b33955ad55ab00f186fcc909e35f6.zip
Backport SF download fix
--HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4077904
Diffstat (limited to 'setuptools/package_index.py')
-rwxr-xr-xsetuptools/package_index.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/package_index.py b/setuptools/package_index.py
index 78b07f4b..32498d0f 100755
--- a/setuptools/package_index.py
+++ b/setuptools/package_index.py
@@ -590,9 +590,8 @@ class PackageIndex(Environment):
def _download_url(self, scheme, url, tmpdir):
# Determine download filename
#
- name = filter(None,urlparse.urlparse(url)[2].split('/'))
+ name, fragment = egg_info_for_url(url)
if name:
- name = name[-1]
while '..' in name:
name = name.replace('..','.').replace('\\','_')
else:
@@ -613,6 +612,7 @@ class PackageIndex(Environment):
self.url_ok(url, True) # raises error if not allowed
return self._attempt_download(url, filename)
+
def scan_url(self, url):
self.process_url(url, True)