[Zope-Checkins] CVS: Zope/lib/python/Products/ZCatalog - Catalog.py:1.81.16.2

[Andreas Jung]

Update of /cvs-repository/Zope/lib/python/Products/ZCatalog
In directory cvs.zope.org:/tmp/cvs-serv20393/lib/python/Products/ZCatalog

Modified Files:
      Tag: Zope-2_5-branch
	Catalog.py 
Log Message:
Collector #771: ZCatalog failed to index DTML Document if the name
of a catalog metadata was identical with the name of an acquired
object.
~


=== Zope/lib/python/Products/ZCatalog/Catalog.py 1.81.16.1 => 1.81.16.2 ===
--- Zope/lib/python/Products/ZCatalog/Catalog.py:1.81.16.1	Thu Aug  1 12:00:59 2002
+++ Zope/lib/python/Products/ZCatalog/Catalog.py	Fri Jan 17 12:06:56 2003
@@ -23,7 +23,7 @@
 
 from Lazy import LazyMap, LazyFilter, LazyCat
 from CatalogBrains import AbstractCatalogBrain, NoBrainer
-
+from DocumentTemplate import cDocumentTemplate
 from BTrees.IIBTree import intersection, weightedIntersection
 from BTrees.OIBTree import OIBTree
 from BTrees.IOBTree import IOBTree
@@ -421,7 +421,7 @@
         # 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)