[Zope3-checkins] CVS: Zope3/src/zope/app/index/text - index.py:1.9.10.1 processors.py:1.6.10.1 queries.py:1.3.10.1

[Grégoire Weber]

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

Modified Files:
      Tag: cw-mail-branch
	index.py processors.py queries.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/index/text/index.py 1.9 => 1.9.10.1 ===
--- Zope3/src/zope/app/index/text/index.py:1.9	Thu May  1 15:35:20 2003
+++ Zope3/src/zope/app/index/text/index.py	Sun Jun 22 10:23:10 2003
@@ -23,7 +23,7 @@
 
 from zope.component import getService, queryAdapter
 from zope.app.services.servicenames import HubIds
-from zope.proxy.context import ContextMethod
+from zope.context import ContextMethod
 from zope.app.interfaces.event import ISubscriber
 from zope.textindex.textindexwrapper import TextIndexWrapper
 
@@ -34,11 +34,11 @@
      IObjectModifiedHubEvent
 from zope.app.interfaces.index.text import ISearchableText
 from zope.app.interfaces.index.text import IUITextIndex
+from zope.interface import implements
 
 class TextIndex(TextIndexWrapper):
 
-    __implements__ = (TextIndexWrapper.__implements__,
-                      ISubscriber, IUITextIndex)
+    implements(ISubscriber, IUITextIndex)
 
     def notify(wrapped_self, event):
         """An event occurred.  Index or unindex the object in response."""


=== Zope3/src/zope/app/index/text/processors.py 1.6 => 1.6.10.1 ===
--- Zope3/src/zope/app/index/text/processors.py:1.6	Thu May  1 15:35:20 2003
+++ Zope3/src/zope/app/index/text/processors.py	Sun Jun 22 10:23:10 2003
@@ -24,10 +24,11 @@
 from zope.app.interfaces.index.interfaces import IBatchedTextIndexQuery
 from zope.app.interfaces.services.query import IQueryProcessor
 from zope.app.index.queries import BatchedRankedResult
+from zope.interface import implements
 
 class BatchedRankedProcessor:
 
-    __implements__ = IQueryProcessor
+    implements(IQueryProcessor)
     __used_for__ = IQuerying
 
     inputInterfaces = (IBatchedTextIndexQuery,)


=== Zope3/src/zope/app/index/text/queries.py 1.3 => 1.3.10.1 ===
--- Zope3/src/zope/app/index/text/queries.py:1.3	Thu May  1 15:35:20 2003
+++ Zope3/src/zope/app/index/text/queries.py	Sun Jun 22 10:23:10 2003
@@ -17,10 +17,11 @@
 """
 
 from zope.app.interfaces.index.interfaces import IBatchedTextIndexQuery
+from zope.interface import implements
 
 class BatchedTextIndexQuery:
 
-    __implements__ = IBatchedTextIndexQuery
+    implements(IBatchedTextIndexQuery)
 
     def __init__(self, query, startposition, batchsize):