[Zope-Checkins] CVS: Products/PluginIndexes/common - UnIndex.py:1.20.2.7

[Tres Seaver]

Update of /cvs-repository/Products/PluginIndexes/common
In directory cvs.zope.org:/tmp/cvs-serv13610/lib/python/Products/PluginIndexes/common

Modified Files:
      Tag: Zope-2_7-branch
	UnIndex.py 
Log Message:

 
   - Collector #889:  made 'and' operator for KeywordIndexes actually
     restrict results as expected (thanks to 'aroda' for the patch!).


=== Products/PluginIndexes/common/UnIndex.py 1.20.2.6 => 1.20.2.7 ===
--- Products/PluginIndexes/common/UnIndex.py:1.20.2.6	Tue Apr  5 09:47:12 2005
+++ Products/PluginIndexes/common/UnIndex.py	Fri May 27 09:03:50 2005
@@ -408,10 +408,11 @@
         else: # not a range search
             for key in record.keys:
                 set=index.get(key, None)
-                if set is not None:
-                    if type(set) is IntType:
-                        set = IISet((set,))
-                    r = set_func(r, set)
+                if set is None:
+                    set = IISet(())
+                elif type(set) is IntType: # isinstance(set, int) for 2.8
+                    set = IISet((set,))
+                r = set_func(r, set)
 
         if type(r) is IntType:  r=IISet((r,))
         if r is None: