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

[Andreas Jung]

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

Modified Files:
	ZCatalog.py 
Log Message:
     - Index constructors were called without acquisition context of the
       calling object. This caused caller.getPhysicalPath() to fail for
       indexes depending on this information.


=== Zope/lib/python/Products/ZCatalog/ZCatalog.py 1.123 => 1.124 ===
--- Zope/lib/python/Products/ZCatalog/ZCatalog.py:1.123	Fri Jan 17 23:17:21 2003
+++ Zope/lib/python/Products/ZCatalog/ZCatalog.py	Tue Feb 25 11:54:40 2003
@@ -19,7 +19,7 @@
 from OFS.FindSupport import FindSupport
 from OFS.ObjectManager import ObjectManager
 from DateTime import DateTime
-from Acquisition import Implicit, aq_base
+from Acquisition import Implicit 
 from Persistence import Persistent
 from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
 from DocumentTemplate.DT_Util import Eval
@@ -913,9 +913,9 @@
         # for new index types is to use an "extra" record.
 
         if 'extra' in base.__init__.func_code.co_varnames:
-            index = base(name, extra=extra, caller=aq_base(self))
+            index = base(name, extra=extra, caller=self)
         else:
-            index = base(name, aq_base(self))
+            index = base(name, self)
 
         self._catalog.addIndex(name,index)