[Zope-Checkins] CVS: Zope/lib/python/Products/PluginIndexes/TopicIndex - TopicIndex.py:1.13.2.3

[Gary Poster]

Update of /cvs-repository/Zope/lib/python/Products/PluginIndexes/TopicIndex
In directory cvs.zope.org:/tmp/cvs-serv14431

Modified Files:
      Tag: Zope-2_7-branch
	TopicIndex.py 
Log Message:
I zigged when I should have zagged in my last checkin: the TopicIndex results need to remain IITreeSets.  I made the necessary corresponding change to the tests.



=== Zope/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py 1.13.2.2 => 1.13.2.3 ===
--- Zope/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py:1.13.2.2	Wed Dec 31 16:09:24 2003
+++ Zope/lib/python/Products/PluginIndexes/TopicIndex/TopicIndex.py	Wed Dec 31 17:39:30 2003
@@ -17,7 +17,7 @@
 from OFS.SimpleItem import SimpleItem
 from zLOG import ERROR, LOG
 from BTrees.OOBTree import OOBTree
-from BTrees.IIBTree import IISet,intersection,union
+from BTrees.IIBTree import IITreeSet,intersection,union
 
 import FilteredSet
 from Products.PluginIndexes import PluggableIndex
@@ -100,9 +100,9 @@
             res = set_func(res,rows)
 
         if res:
-            return res.keys(), (self.id,)
+            return res, (self.id,)
         else:
-            return IISet(), (self.id,)
+            return IITreeSet(), (self.id,)
 
     def uniqueValues(self,name=None, withLength=0):
         """ needed to be consistent with the interface """