[Zope-Checkins] CVS: Zope2 - util.py:1.1.2.3

[andreas@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/Products/PluginIndexes/common
In directory serenade:/tmp/cvs-serv19017/common

Modified Files:
      Tag: ajung-dropin-registry
	util.py 
Log Message:
fixed test for Record 



--- Updated File util.py in package Zope2 --
--- util.py	2001/05/22 14:04:50	1.1.2.2
+++ util.py	2001/05/22 16:48:39	1.1.2.3
@@ -115,18 +115,20 @@
 
         keys = request[iid]
 
-        if type(keys) in [StringType,ListType]:
+        if repr(type(keys)).find('instance')==-1:
+            """ query is tuple, list or string """
 
-            if type(keys) == StringType: 
-                self.keys = [keys.strip()]
-            else:
+            if type(keys) in [TupleType,ListType]:
                 self.keys  = keys
+            else:
+                self.keys = [keys.strip()]
 
             params = filter(lambda x,id=self.id: x.startswith(id+'_') , request.keys())
             params = map(lambda x,id=self.id: x[len(id)+1:],params)
             for p in params: 
                 setattr(self,p,request[self.id+'_'+p])
 
+
         else:
             """ query is of type record """
             record = keys
@@ -135,7 +137,6 @@
                 keys = record.query
             else:
                 raise self.ParserException,"record for '%s' *must* contain a 'query' attribute" % self.id
-        
             
             if type(keys)== StringType:
                 self.keys = [keys.strip()]