Use @implementer class decorator.

Also fix test_retrieval in DateRangeIndex/tests.

CHANGES.rst

@@ -4,6 +4,8 @@ Changelog
 4.0 (unreleased)
 ----------------
 
+- Use `@implementer` class decorator.
+
 - Add `__contains__` method to ZCatalogIndexes, fixes zopefoundation/Zope#69.
 
 - Raise BadRequest instead of returning MessageDialog.

src/Products/PluginIndexes/CompositeIndex/CompositeIndex.py

@@ -23,7 +23,7 @@
 from BTrees.OOBTree import difference
 from BTrees.OOBTree import OOSet
 from Persistence import PersistentMapping
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.PluginIndexes.interfaces import ITransposeQuery
 from Products.PluginIndexes.KeywordIndex.KeywordIndex import KeywordIndex
@@ -146,12 +146,12 @@ def __repr__(self):
             (self.id, self.meta_type, self.attributes)
 
 
+@implementer(ITransposeQuery)
 class CompositeIndex(KeywordIndex):
 
     """Index for composition of simple fields.
        or sequences of items
     """
-    implements(ITransposeQuery)
 
     meta_type = "CompositeIndex"
 

src/Products/PluginIndexes/DateIndex/DateIndex.py

@@ -23,7 +23,7 @@
 from DateTime.DateTime import DateTime
 from OFS.PropertyManager import PropertyManager
 from ZODB.POSException import ConflictError
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.PluginIndexes.interfaces import IDateIndex
 from Products.PluginIndexes.unindex import UnIndex
@@ -76,10 +76,10 @@ def _isdst(self, dt):
 ###############################################################################
 
 
+@implementer(IDateIndex)
 class DateIndex(UnIndex, PropertyManager):
     """Index for dates.
     """
-    implements(IDateIndex)
 
     meta_type = 'DateIndex'
     query_options = ('query', 'range', 'not')

src/Products/PluginIndexes/DateRangeIndex/DateRangeIndex.py

@@ -27,7 +27,7 @@
 from BTrees.IOBTree import IOBTree
 from BTrees.Length import Length
 from DateTime.DateTime import DateTime
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.PluginIndexes.interfaces import IDateRangeIndex
 from Products.PluginIndexes.unindex import UnIndex
@@ -38,6 +38,7 @@
 MAX32 = int(2 ** 31 - 1)
 
 
+@implementer(IDateRangeIndex)
 class DateRangeIndex(UnIndex):
 
     """Index for date ranges, such as the "effective-expiration" range in CMF.
@@ -58,7 +59,6 @@ class DateRangeIndex(UnIndex):
 
     - Objects which match only during a specific interval.
     """
-    implements(IDateRangeIndex)
 
     security = ClassSecurityInfo()
 

src/Products/PluginIndexes/DateRangeIndex/tests.py

@@ -149,7 +149,7 @@ def test_retrieval(self):
         for value in range(-1, 15):
             matches = matchingDummiesByTimeValue(value)
             results, used = self._checkApply(index, {'work': value}, matches)
-            matches = sorted(matches, key=lambda d: d[1].name)
+            matches = sorted(matches, key=lambda d: d[1].name())
 
             for result, match in map(None, results, matches):
                 self.assertEqual(index.getEntryForObject(result),

src/Products/PluginIndexes/PathIndex/PathIndex.py

@@ -24,7 +24,7 @@
 from BTrees.OOBTree import OOBTree
 from BTrees.Length import Length
 from Persistence import Persistent
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.PluginIndexes.interfaces import (
     IPathIndex,
@@ -38,6 +38,7 @@
 LOG = getLogger('Zope.PathIndex')
 
 
+@implementer(IPathIndex, IQueryIndex, IUniqueValueIndex, ISortIndex)
 class PathIndex(Persistent, SimpleItem):
 
     """Index for paths returned by getPhysicalPath.
@@ -53,7 +54,6 @@ class PathIndex(Persistent, SimpleItem):
     - the value is a mapping 'level of the path component' to
       'all docids with this path component on this level'
     """
-    implements(IPathIndex, IQueryIndex, IUniqueValueIndex, ISortIndex)
 
     meta_type = "PathIndex"
 

src/Products/PluginIndexes/TopicIndex/FilteredSet.py

@@ -18,18 +18,17 @@
 from Persistence import Persistent
 from RestrictedPython.Eval import RestrictionCapableEval
 from ZODB.POSException import ConflictError
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.PluginIndexes.interfaces import IFilteredSet
 
 LOG = getLogger('Zope.TopicIndex.FilteredSet')
 
 
+@implementer(IFilteredSet)
 class FilteredSetBase(Persistent):
     # A pre-calculated result list based on an expression.
 
-    implements(IFilteredSet)
-
     def __init__(self, id, expr):
         self.id = id
         self.expr = expr

src/Products/PluginIndexes/TopicIndex/TopicIndex.py

@@ -20,7 +20,7 @@
 from BTrees.OOBTree import OOBTree
 from OFS.SimpleItem import SimpleItem
 from Persistence import Persistent
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.PluginIndexes.interfaces import (
     IQueryIndex,
@@ -33,13 +33,13 @@
 LOG = getLogger('Zope.TopicIndex')
 
 
+@implementer(ITopicIndex, IQueryIndex)
 class TopicIndex(Persistent, SimpleItem):
     """A TopicIndex maintains a set of FilteredSet objects.
 
     Every FilteredSet object consists of an expression and and IISet with all
     Ids of indexed objects that eval with this expression to 1.
     """
-    implements(ITopicIndex, IQueryIndex)
 
     meta_type = "TopicIndex"
     query_options = ('query', 'operator')

src/Products/PluginIndexes/unindex.py

@@ -31,7 +31,7 @@
 from BTrees.OOBTree import OOBTree
 from OFS.SimpleItem import SimpleItem
 from ZODB.POSException import ConflictError
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.PluginIndexes.cache import RequestCache
 from Products.PluginIndexes.interfaces import (
@@ -48,11 +48,11 @@
 LOG = getLogger('Zope.UnIndex')
 
 
+@implementer(ILimitedResultIndex, IQueryIndex, IUniqueValueIndex,
+             ISortIndex, IRequestCacheIndex)
 class UnIndex(SimpleItem):
     """Simple forward and reverse index.
     """
-    implements(ILimitedResultIndex, IQueryIndex, IUniqueValueIndex,
-               ISortIndex, IRequestCacheIndex)
 
     _counter = None
     operators = ('or', 'and')

src/Products/ZCTextIndex/BaseIndex.py

@@ -24,7 +24,7 @@
 from BTrees.IIBTree import intersection
 from BTrees.Length import Length
 from Persistence import Persistent
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.ZCTextIndex import WidCode
 from Products.ZCTextIndex.interfaces import IIndex
@@ -55,10 +55,9 @@ def unique(l):
     return IITreeSet(l).keys()
 
 
+@implementer(IIndex)
 class BaseIndex(Persistent):
 
-    implements(IIndex)
-
     def __init__(self, lexicon):
         self._lexicon = lexicon
 

src/Products/ZCTextIndex/CosineIndex.py

@@ -17,7 +17,7 @@
 import math
 
 from BTrees.IIBTree import IIBucket
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.ZCTextIndex.interfaces import IIndex
 from Products.ZCTextIndex.BaseIndex import BaseIndex
@@ -26,10 +26,9 @@
 from Products.ZCTextIndex.BaseIndex import SCALE_FACTOR
 
 
+@implementer(IIndex)
 class CosineIndex(BaseIndex):
 
-    implements(IIndex)
-
     def __init__(self, lexicon):
         BaseIndex.__init__(self, lexicon)
 

src/Products/ZCTextIndex/HTMLSplitter.py

@@ -13,16 +13,15 @@
 ##############################################################################
 import re
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.ZCTextIndex.interfaces import ISplitter
 from Products.ZCTextIndex.PipelineFactory import element_factory
 
 
+@implementer(ISplitter)
 class HTMLWordSplitter(object):
 
-    implements(ISplitter)
-
     def process(self, text, wordpat=r"(?L)\w+"):
         splat = []
         for t in text:

src/Products/ZCTextIndex/Lexicon.py

@@ -21,18 +21,17 @@
 from BTrees.OIBTree import OIBTree
 from BTrees.Length import Length
 from Persistence import Persistent
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.ZCTextIndex.interfaces import ILexicon
 from Products.ZCTextIndex.StopDict import get_stopdict
 from Products.ZCTextIndex.ParseTree import QueryError
 from Products.ZCTextIndex.PipelineFactory import element_factory
 
 
+@implementer(ILexicon)
 class Lexicon(Persistent):
 
-    implements(ILexicon)
-
     _v_nextid = None
     _wid_length_based = True  # Flag to distinguish new and old lexica
 

src/Products/ZCTextIndex/NBest.py

@@ -19,13 +19,13 @@
 """
 
 from bisect import bisect
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.ZCTextIndex.interfaces import INBest
 
 
+@implementer(INBest)
 class NBest(object):
-    implements(INBest)
 
     def __init__(self, n):
         "Build an NBest object to remember the N best-scoring objects."

src/Products/ZCTextIndex/OkapiIndex.py

@@ -19,18 +19,17 @@
 
 from BTrees.IIBTree import IIBucket
 from BTrees.Length import Length
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.ZCTextIndex.interfaces import IIndex
 from Products.ZCTextIndex.BaseIndex import BaseIndex
 from Products.ZCTextIndex.BaseIndex import inverse_doc_frequency
 from Products.ZCTextIndex.BaseIndex import scaled_int
 
 
+@implementer(IIndex)
 class OkapiIndex(BaseIndex):
 
-    implements(IIndex)
-
     # BM25 free parameters.
     K1 = 1.2
     B = 0.75

src/Products/ZCTextIndex/ParseTree.py

@@ -14,7 +14,7 @@
 
 """Generic parser support: exception and parse tree nodes."""
 from BTrees.IIBTree import difference
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.ZCTextIndex.interfaces import IQueryParseTree
 from Products.ZCTextIndex.SetOps import mass_weightedIntersection
@@ -29,10 +29,9 @@ class ParseError(Exception):
     pass
 
 
+@implementer(IQueryParseTree)
 class ParseTreeNode(object):
 
-    implements(IQueryParseTree)
-
     _nodeType = None
 
     def __init__(self, value):

src/Products/ZCTextIndex/PipelineFactory.py

@@ -11,15 +11,14 @@
 # FOR A PARTICULAR PURPOSE
 #
 ##############################################################################
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.ZCTextIndex.interfaces import IPipelineElementFactory
 
 
+@implementer(IPipelineElementFactory)
 class PipelineElementFactory(object):
 
-    implements(IPipelineElementFactory)
-
     def __init__(self):
         self._groups = {}
 

src/Products/ZCTextIndex/QueryParser.py

@@ -57,7 +57,7 @@
 import re
 import sys
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.ZCTextIndex.interfaces import IQueryParser
 from Products.ZCTextIndex import ParseTree
@@ -118,10 +118,9 @@ def __repr__(self):
     _tokenizer_regex.pattern, _tokenizer_regex.flags | re.UNICODE)
 
 
+@implementer(IQueryParser)
 class QueryParser(object):
 
-    implements(IQueryParser)
-
     # This class is not thread-safe;
     # each thread should have its own instance
 

src/Products/ZCTextIndex/ZCTextIndex.py

@@ -29,7 +29,7 @@
 from App.special_dtml import DTMLFile
 from OFS.SimpleItem import SimpleItem
 from Persistence import Persistent
-from zope.interface import implements
+from zope.interface import implementer
 
 from Products.PluginIndexes.interfaces import IPluggableIndex
 from Products.PluginIndexes.interfaces import IQueryIndex
@@ -55,11 +55,11 @@
     basestring = str
 
 
+@implementer(IZCTextIndex, IQueryIndex, IPluggableIndex)
 class ZCTextIndex(Persistent, Implicit, SimpleItem):
 
     """Persistent text index.
     """
-    implements(IZCTextIndex, IQueryIndex, IPluggableIndex)
 
     meta_type = 'ZCTextIndex'
     operators = ('and', 'or')
@@ -312,13 +312,12 @@ def manage_addLexicon(self, id, title='', elements=[], REQUEST=None):
 LexiconMgmtPerm = manage_vocabulary
 
 
+@implementer(IZCLexicon)
 class PLexicon(Lexicon, Implicit, SimpleItem):
 
     """Lexicon for ZCTextIndex.
     """
 
-    implements(IZCLexicon)
-
     meta_type = 'ZCTextIndex Lexicon'
 
     manage_options = ({'label': 'Overview', 'action': 'manage_main'},