[Zope-Checkins] CVS: Zope/lib/python/Products/PluginIndexes/PathIndex - PathIndex.py:1.22.10.1

[Matt Behrens]

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

Modified Files:
      Tag: zigg_unix-install-control-config-branch
	PathIndex.py 
Log Message:
Merge in HEAD (except setup.py... gotta chat about that one) :-)


=== Zope/lib/python/Products/PluginIndexes/PathIndex/PathIndex.py 1.22 => 1.22.10.1 ===
         """ hook for (Z)Catalog """
 
-
         # first we check if the object provide an attribute or
         # method to be used as hook for the PathIndex
 
@@ -112,9 +111,9 @@
             except:
                 return 0
 
-
-            if not isinstance(path,StringType):
-                raise TypeError, "attribute/method must be string"
+            if not (isinstance(path,StringType) or 
+                    isinstance(path,TupleType)):
+                raise TypeError, "attribute/method must be/return string or tuple"
 
         else: