Collector #771: ZCatalog failed to index DTML Document if the name

of a catalog metadata was identical with the name of an acquired
object.
~

doc/CHANGES.txt

@@ -24,6 +24,10 @@ Zope Changes
 
     Bugs Fixed
 
+     - Collector #771: ZCatalog failed to index DTML Document if the name
+       of a catalog metadata was identical with the name of an acquired
+       object.
+
      - Collector #686: intSets no longer lose their values.
 
      - Collector #685: Improved documentation explaining how, where and 

lib/python/Products/ZCatalog/Catalog.py

@@ -22,7 +22,7 @@ from zLOG import LOG, ERROR
 
 from Lazy import LazyMap, LazyFilter, LazyCat, LazyValues
 from CatalogBrains import AbstractCatalogBrain, NoBrainer
-
+from DocumentTemplate import cDocumentTemplate
 from BTrees.IIBTree import intersection, weightedIntersection, IISet
 from BTrees.OIBTree import OIBTree
 from BTrees.IOBTree import IOBTree
@@ -401,7 +401,7 @@ class Catalog(Persistent, Acquisition.Implicit, ExtensionClass.Base):
         # the unique id is allways the first element
         for x in self.names:
             attr=getattr(object, x, MV)
-            if(attr is not MV and callable(attr)): attr=attr()
+            if(attr is not MV and cDocumentTemplate.safe_callable(attr)): attr=attr()
             record.append(attr)
         return tuple(record)