[Zope3-checkins] CVS: Zope3/src/zope/app/index - __init__.py:1.4.6.1 processors.py:1.10.24.1

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/index
In directory cvs.zope.org:/tmp/cvs-serv20092/src/zope/app/index

Modified Files:
      Tag: parentgeddon-branch
	__init__.py processors.py 
Log Message:
Checking in work in progress on parentgeddon-branch so Fred can help
me to get the tests passing.  Specific log entries will be provided
when we merge this into the head.


=== Zope3/src/zope/app/index/__init__.py 1.4 => 1.4.6.1 ===
--- Zope3/src/zope/app/index/__init__.py:1.4	Sun Aug 17 02:06:47 2003
+++ Zope3/src/zope/app/index/__init__.py	Mon Sep  8 14:21:40 2003
@@ -19,7 +19,6 @@
 from zope.app.interfaces.index import IInterfaceIndexer
 from zope.app.interfaces.event import ISubscriber
 from zope.component import queryAdapter
-from zope.context import ContextMethod
 
 from zope.app.interfaces.services.hub import \
      IObjectRegisteredHubEvent, \
@@ -77,5 +76,4 @@
                 self.unindex_doc(event.hubid)
             except KeyError:
                 pass
-    notify = ContextMethod(notify)
 


=== Zope3/src/zope/app/index/processors.py 1.10 => 1.10.24.1 ===
--- Zope3/src/zope/app/index/processors.py:1.10	Sat Jun  7 02:37:26 2003
+++ Zope3/src/zope/app/index/processors.py	Mon Sep  8 14:21:40 2003
@@ -25,10 +25,10 @@
 
 from zope.component import getAdapter, getService
 from zope.app.services.servicenames import HubIds
-from zope.context import ContextMethod
+from zope.app.container.contained import Contained
 from zope.interface import implements
 
-class ObjectRetrievingProcessor:
+class ObjectRetrievingProcessor(Contained):
     """Converts a RankedHubIdList into an iteratable
        list of ranked objects by retrieving the objects
        from the ObjectHub.
@@ -39,11 +39,11 @@
     inputInterfaces = (IRankedHubIdList, IBatchedResult)
     outputInterfaces = (IRankedObjectIterator,)
 
-    def __call__(wrapped_self, query):
+    def __call__(self, query):
         list = getAdapter(query, IRankedHubIdList)
         batch = getAdapter(query, IBatchedResult)
 
-        objectHub = getService(wrapped_self, HubIds)
+        objectHub = getService(self, HubIds)
 
         # XXX do we need wrapping for the objects returned by the hub?
         iterator = RankedObjectIterator(
@@ -52,7 +52,6 @@
                         )
 
         return iterator
-    __call__ = ContextMethod(__call__)
 
 class RankedObjectIterator:
     """Iterates over a given list of IRankedObjectRecord."""