[Python-checkins] commit of r41550 - sandbox/trunk/setuptools

[phillip.eby@python.org]

Author: phillip.eby
Date: Sat Nov 26 19:59:35 2005
New Revision: 41550

Modified:
   sandbox/trunk/setuptools/EasyInstall.txt
   sandbox/trunk/setuptools/pkg_resources.py
Log:
If more than one URL appears to describe the exact same distribution, prefer
the shortest one.  This helps to avoid "table of contents" CGI URLs like the
ones on effbot.org.


Modified: sandbox/trunk/setuptools/EasyInstall.txt
==============================================================================
--- sandbox/trunk/setuptools/EasyInstall.txt	(original)
+++ sandbox/trunk/setuptools/EasyInstall.txt	Sat Nov 26 19:59:35 2005
@@ -870,6 +870,10 @@
  * Fixed ``.pth`` file processing picking up nested eggs (i.e. ones inside
    "baskets") when they weren't explicitly listed in the ``.pth`` file.
 
+ * If more than one URL appears to describe the exact same distribution, prefer
+   the shortest one.  This helps to avoid "table of contents" CGI URLs like the
+   ones on effbot.org.
+
 0.6a8
  * Update for changed SourceForge mirror format
  

Modified: sandbox/trunk/setuptools/pkg_resources.py
==============================================================================
--- sandbox/trunk/setuptools/pkg_resources.py	(original)
+++ sandbox/trunk/setuptools/pkg_resources.py	Sat Nov 26 19:59:35 2005
@@ -1754,7 +1754,7 @@
     hashcmp = property(
         lambda self: (
             getattr(self,'parsed_version',()), self.precedence, self.key,
-            self.location, self.py_version, self.platform
+            -len(self.location), self.location, self.py_version, self.platform
         )
     )
     def __cmp__(self, other): return cmp(self.hashcmp, other)