[Zope-Checkins] CVS: Products/ZCatalog - Catalog.py:1.74.4.3

[Evan Simpson]

Update of /cvs-repository/Products/ZCatalog
In directory cvs.zope.org:/tmp/cvs-serv22159/lib/python/Products/ZCatalog

Modified Files:
      Tag: Zope-2_4-branch
	Catalog.py 
Log Message:
Collector #2427, 2429

 
=== Products/ZCatalog/Catalog.py 1.74.4.2 => 1.74.4.3 ===
         return result
     
-## Searching engine.  You don't really have to worry about what goes
-## on below here...  Most of this stuff came from ZTables with tweaks.
-## But I worry about :-)
-
     def _indexedSearch(self, request , sort_index, append, used):
         """
         Iterate through the indexes, applying the query to each one.
@@ -554,6 +550,7 @@
             else:
                 try:
                     for k, intset in sort_index.items():
+                        if hasattr(intset, 'keys'): intset=intset.keys() 
                         append((k,LazyMap(self.__getitem__, intset)))
                 except AttributeError:
                     raise ValueError, (