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

Andreas Jung andreas@andreas-jung.com
Sun, 19 Jan 2003 06:13:12 -0500


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

Modified Files:
	Catalog.py 
Log Message:
forgotten to remove cDocumentTemplate import

=== Zope/lib/python/Products/ZCatalog/Catalog.py 1.106 => 1.107 ===
--- Zope/lib/python/Products/ZCatalog/Catalog.py:1.106	Sun Jan 19 06:09:44 2003
+++ Zope/lib/python/Products/ZCatalog/Catalog.py	Sun Jan 19 06:13:09 2003
@@ -22,7 +22,6 @@
 
 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
@@ -419,7 +418,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 cDocumentTemplate.safe_callable(attr)): attr=attr()
+            if(attr is not MV and safe_callable(attr)): attr=attr()
             record.append(attr)
         return tuple(record)