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

Mon Feb 1 17:42:04 CET 2010

Author: phillip.eby
Date: Mon Feb 1 17:42:04 2010
New Revision: 77904
Log:
Backport SF download fix
Modified:
 sandbox/branches/setuptools-0.6/EasyInstall.txt
 sandbox/branches/setuptools-0.6/setuptools/package_index.py
Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================

--- sandbox/branches/setuptools-0.6/EasyInstall.txt	(original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt	Mon Feb 1 17:42:04 2010
@@ -1224,6 +1224,8 @@
 * Fixed bogus AttributeError when no local or downloadable packages are
 available
 
+ * Fix for recent Sourceforge downloading changes
+
 0.6c11
 * Fix installed script .exe files not working with 64-bit Python on Windows
 (wasn't actually released in 0.6c10 due to a lost checkin)
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	Mon Feb 1 17:42:04 2010
@@ -590,9 +590,8 @@
 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 @@
 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)
 
