[Python-checkins] python/nondist/sandbox/setuptools/setuptools package_index.py, 1.16, 1.17

[pje@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32307/setuptools

Modified Files:
	package_index.py 
Log Message:
Fix bugs reported by Ian Bicking, Walter Doerwald, and Vincenzo Di Massa.


Index: package_index.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/package_index.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- package_index.py	7 Aug 2005 01:03:35 -0000	1.16
+++ package_index.py	11 Aug 2005 00:37:37 -0000	1.17
@@ -7,6 +7,8 @@
 
 EGG_FRAGMENT = re.compile('^egg=(\\w+(-\\w+)?)$')
 HREF = re.compile("""href\\s*=\\s*['"]?([^'"> ]+)""", re.I)
+# this is here to fix emacs' cruddy broken syntax highlighting: '
+
 URL_SCHEME = re.compile('([-+.a-z0-9]{2,}):',re.I).match
 EXTENSIONS = ".tar.gz .tar.bz2 .tar .zip .tgz".split()
 
@@ -37,8 +39,6 @@
 
 
 
-
-
 def distros_for_url(url, metadata=None):
     """Yield egg or source distribution objects that might be found at a URL"""
 
@@ -371,10 +371,10 @@
 
     def _download_to(self, url, filename):
         self.info("Downloading %s", url)
-
         # Download the file
         fp, tfp = None, None
         try:
+            url = url.split('#', 1)[0]
             fp = self.open_url(url)
             if isinstance(fp, urllib2.HTTPError):
                 raise DistutilsError(