[Python-checkins] r50757 - sandbox/branches/setuptools-0.6/pkg_resources.py sandbox/branches/setuptools-0.6/pkg_resources.txt

[phillip.eby]

Author: phillip.eby
Date: Fri Jul 21 18:58:10 2006
New Revision: 50757

Modified:
   sandbox/branches/setuptools-0.6/pkg_resources.py
   sandbox/branches/setuptools-0.6/pkg_resources.txt
Log:
Fix a problem with eggs specified directly on ``PYTHONPATH`` on
case-insensitive filesystems possibly not showing up in the default
working set, due to differing normalizations of ``sys.path`` entries.
(backport from trunk)


Modified: sandbox/branches/setuptools-0.6/pkg_resources.py
==============================================================================
--- sandbox/branches/setuptools-0.6/pkg_resources.py	(original)
+++ sandbox/branches/setuptools-0.6/pkg_resources.py	Fri Jul 21 18:58:10 2006
@@ -438,17 +438,17 @@
         if entry is None:
             entry = dist.location
         keys = self.entry_keys.setdefault(entry,[])
-
+        keys2 = self.entry_keys.setdefault(dist.location,[])
         if dist.key in self.by_key:
             return      # ignore hidden distros
 
         self.by_key[dist.key] = dist
         if dist.key not in keys:
             keys.append(dist.key)
-
+        if dist.key not in keys2:
+            keys2.append(dist.key)
         self._added_new(dist)
 
-
     def resolve(self, requirements, env=None, installer=None):
         """List all distributions needed to (recursively) meet `requirements`
 

Modified: sandbox/branches/setuptools-0.6/pkg_resources.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/pkg_resources.txt	(original)
+++ sandbox/branches/setuptools-0.6/pkg_resources.txt	Fri Jul 21 18:58:10 2006
@@ -1687,6 +1687,11 @@
 Release Notes/Change History
 ----------------------------
 
+0.6c2
+ * Fix a problem with eggs specified directly on ``PYTHONPATH`` on
+   case-insensitive filesystems possibly not showing up in the default
+   working set, due to differing normalizations of ``sys.path`` entries.
+
 0.6b3
  * Fixed a duplicate path insertion problem on case-insensitive filesystems.