Use zope.interface decorator

This not only makes code more pleasent to read,
but also makes the code python 3 compatible
(while maintaining python 2 compatibility).

CHANGES.rst

@@ -15,7 +15,8 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- Use zope.interface decorator.
+  [gforcada]
 
 
 2.2.12 (2016-05-15)

Products/ATContentTypes/browser/download.py

@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 from AccessControl import Unauthorized
 from Products.Five import BrowserView
-from zope.interface import implements
+from zope.interface import implementer
 from zope.publisher.interfaces import IPublishTraverse
 from zope.publisher.interfaces import NotFound as pNotFound
 
 
+@implementer(IPublishTraverse)
 class DownloadArchetypeFile(BrowserView):
     """Basically, straight copy from plone.namedfile
     """
-    implements(IPublishTraverse)
 
     def __init__(self, context, request):
         super(DownloadArchetypeFile, self).__init__(context, request)

Products/ATContentTypes/browser/nextprevious.py

@@ -7,15 +7,14 @@
 from Products.CMFCore.utils import getToolByName
 from zope.component import adapts
 from zope.component import getUtility
-from zope.interface import implements
+from zope.interface import implementer
 
 
+@implementer(INextPreviousProvider)
 class ATFolderNextPrevious(object):
     """Let a folder act as a next/previous provider. This will be
     automatically found by the @@plone_nextprevious_view and viewlet.
     """
-
-    implements(INextPreviousProvider)
     adapts(IATFolder)
 
     def __init__(self, context):

Products/ATContentTypes/content/base.py

@@ -21,7 +21,7 @@
 from webdav.NullResource import NullResource
 from webdav.Resource import Resource as WebdavResoure
 from ZODB.POSException import ConflictError
-from zope.interface import implements
+from zope.interface import implementer
 
 import logging
 import os
@@ -88,6 +88,7 @@ def __getattr__(self, name):
         return getattr(self.__ob, name)
 
 
+@implementer(IATContentType)
 class ATCTMixin(BrowserDefaultMixin):
     """Mixin class for AT Content Types"""
 
@@ -103,8 +104,6 @@ class ATCTMixin(BrowserDefaultMixin):
     isDocTemp = False
     _at_rename_after_creation = True  # rename object according to the title?
 
-    implements(IATContentType)
-
     security = ClassSecurityInfo()
 
     @security.protected(ModifyPortalContent)
@@ -438,11 +437,10 @@ def get_size(self):
 InitializeClass(ATCTFolder)
 
 
+@implementer(ISelectableConstrainTypes)
 class ATCTFolderMixin(ConstrainTypesMixin, ATCTMixin):
     """ Constrained folderish type """
 
-    implements(ISelectableConstrainTypes)
-
     security = ClassSecurityInfo()
 
     def __browser_default__(self, request):

Products/ATContentTypes/content/document.py

@@ -24,7 +24,7 @@
 from Products.CMFCore.utils import getToolByName
 from Products.GenericSetup.interfaces import IDAVAware
 from types import TupleType
-from zope.interface import implements
+from zope.interface import implementer
 from ZPublisher.HTTPRequest import HTTPRequest
 
 
@@ -217,6 +217,7 @@ def manage_afterPUT(self, data, marshall_data, file, context, mimetype,
                                     RESPONSE)
 
 
+@implementer(IATDocument, IDAVAware)
 class ATDocument(ATDocumentBase):
     """A page in the site. Can contain rich text."""
 
@@ -228,6 +229,4 @@ class ATDocument(ATDocumentBase):
     assocMimetypes = ('application/xhtml+xml', 'message/rfc822', 'text/*',)
     assocFileExt = ('txt', 'stx', 'rst', 'rest', 'py',)
 
-    implements(IATDocument, IDAVAware)
-
 registerATCT(ATDocument, PROJECTNAME)

Products/ATContentTypes/content/event.py

@@ -25,7 +25,7 @@
 from Products.ATContentTypes.lib.historyaware import HistoryAwareMixin
 from Products.CMFCore.permissions import ModifyPortalContent
 from Products.CMFCore.permissions import View
-from zope.interface import implements
+from zope.interface import implementer
 
 
 ATEventSchema = ATContentTypeSchema.copy() + Schema((
@@ -164,6 +164,7 @@
 ATEventSchema.moveField('location', before='startDate')
 
 
+@implementer(IATEvent)
 class ATEvent(ATCTContent, CalendarSupportMixin, HistoryAwareMixin):
     """Information about an upcoming event.
 
@@ -183,8 +184,6 @@ class ATEvent(ATCTContent, CalendarSupportMixin, HistoryAwareMixin):
                     'start_date', 'end_date', 'contact_name', 'contact_email',
                     'contact_phone', 'event_url')
 
-    implements(IATEvent)
-
     security = ClassSecurityInfo()
 
     @security.private

Products/ATContentTypes/content/file.py

@@ -23,7 +23,7 @@
 from Products.validation.config import validation
 from Products.validation.validators.SupplValidators import MaxSizeValidator
 from urllib import quote
-from zope.interface import implements
+from zope.interface import implementer
 
 import logging
 
@@ -56,6 +56,7 @@
 finalizeATCTSchema(ATFileSchema)
 
 
+@implementer(IATFile)
 class ATFile(ATCTFileContent):
     """An external file uploaded to the site."""
 
@@ -74,8 +75,6 @@ class ATFile(ATCTFileContent):
                        'application/pdf',
                        'application/x-shockwave-flash',)
 
-    implements(IATFile)
-
     security = ClassSecurityInfo()
 
     @security.protected(View)

Products/ATContentTypes/content/folder.py

@@ -13,7 +13,7 @@
 from Products.ATContentTypes.interfaces import IATFolder
 from Products.ATContentTypes.lib.constraintypes import ConstrainTypesMixinSchema  # noqa
 from Products.CMFCore.permissions import View
-from zope.interface import implements
+from zope.interface import implementer
 
 
 ATFolderSchema = folder.ATFolderSchema
@@ -32,6 +32,7 @@
     HAS_LINGUAPLONE = False
 
 
+@implementer(IATFolder, IOrderedContainer)
 class ObsoleteATFolder(ATCTOrderedFolder):
     """A folder which can contain other items."""
 
@@ -45,8 +46,6 @@ class ObsoleteATFolder(ATCTOrderedFolder):
     assocFileExt = ()
     cmf_edit_kws = ()
 
-    implements(IATFolder, IOrderedContainer)
-
     # Enable marshalling via WebDAV/FTP.
     __dav_marshall__ = True
 
@@ -96,6 +95,7 @@ class ATFolder(folder.ATFolder):
 registerATCT(ATFolder, PROJECTNAME)
 
 
+@implementer(IATBTreeFolder)
 class ATBTreeFolder(ATCTBTreeFolder):
     """A folder suitable for holding a very large number of items.
 
@@ -115,8 +115,6 @@ class ATBTreeFolder(ATCTBTreeFolder):
     assocFileExt = ()
     cmf_edit_kws = ()
 
-    implements(IATBTreeFolder)
-
     # Enable marshalling via WebDAV/FTP.
     __dav_marshall__ = True
 

Products/ATContentTypes/content/image.py

@@ -21,7 +21,7 @@
 from Products.validation import V_REQUIRED
 from Products.validation.config import validation
 from Products.validation.validators.SupplValidators import MaxSizeValidator
-from zope.interface import implements
+from zope.interface import implementer
 
 
 validation.register(MaxSizeValidator('checkImageMaxSize',
@@ -65,6 +65,7 @@
 finalizeATCTSchema(ATImageSchema)
 
 
+@implementer(IATImage)
 class ATImage(ATCTFileContent, ATCTImageTransform):
     """An image, which can be referenced in documents.
 
@@ -81,8 +82,6 @@ class ATImage(ATCTFileContent, ATCTImageTransform):
     assocFileExt = ('jpg', 'jpeg', 'png', 'gif', )
     cmf_edit_kws = ('file', )
 
-    implements(IATImage)
-
     security = ClassSecurityInfo()
 
     def exportImage(self, format, width, height):

Products/ATContentTypes/content/link.py

@@ -13,7 +13,7 @@
 from Products.CMFCore.permissions import ModifyPortalContent
 from Products.CMFCore.permissions import View
 from urllib import quote
-from zope.interface import implements
+from zope.interface import implementer
 
 import urlparse
 
@@ -35,6 +35,7 @@
 finalizeATCTSchema(ATLinkSchema)
 
 
+@implementer(IATLink)
 class ATLink(ATCTContent):
     """A link to an internal or external resource."""
 
@@ -47,8 +48,6 @@ class ATLink(ATCTContent):
     assocFileExt = ('link', 'url', )
     cmf_edit_kws = ('remote_url', )
 
-    implements(IATLink)
-
     security = ClassSecurityInfo()
 
     @security.protected(ModifyPortalContent)

Products/ATContentTypes/content/newsitem.py

@@ -23,7 +23,7 @@
 from Products.validation import V_REQUIRED
 from Products.validation.config import validation
 from Products.validation.validators.SupplValidators import MaxSizeValidator
-from zope.interface import implements
+from zope.interface import implementer
 
 
 validation.register(MaxSizeValidator('checkNewsImageMaxSize',
@@ -90,6 +90,7 @@
 finalizeATCTSchema(ATNewsItemSchema)
 
 
+@implementer(IATNewsItem)
 class ATNewsItem(ATDocumentBase, ATCTImageTransform):
     """An announcement that will show up on the news portlet.
 
@@ -106,8 +107,6 @@ class ATNewsItem(ATDocumentBase, ATCTImageTransform):
     assocFileExt = ('news', )
     cmf_edit_kws = ATDocumentBase.cmf_edit_kws
 
-    implements(IATNewsItem)
-
     security = ClassSecurityInfo()
 
     @security.protected(View)

Products/ATContentTypes/content/topic.py

@@ -37,7 +37,7 @@
 from types import StringType
 from types import TupleType
 from webdav.Resource import Resource as WebdavResoure
-from zope.interface import implements
+from zope.interface import implementer
 from ZPublisher.HTTPRequest import HTTPRequest
 
 
@@ -144,6 +144,7 @@
 finalizeATCTSchema(ATTopicSchema, folderish=False, moveDiscussion=False)
 
 
+@implementer(IATTopic, IDisabledExport)
 class ATTopic(ATCTFolder):
     """An automatically updated stored search.
 
@@ -159,7 +160,6 @@ class ATTopic(ATCTFolder):
     assocMimetypes = ()
     assocFileExt = ()
     cmf_edit_kws = ()
-    implements(IATTopic, IDisabledExport)
 
     # Enable marshalling via WebDAV/FTP
     __dav_marshall__ = True

Products/ATContentTypes/criteria/base.py

@@ -9,7 +9,7 @@
 from Products.CMFCore.permissions import View
 from zope.interface import classImplementsOnly
 from zope.interface import implementedBy
-from zope.interface import implements
+from zope.interface import implementer
 
 
 class NonRefCatalogContent(BaseContentMixin):
@@ -42,13 +42,12 @@ def reindexObject(self, *args, **kwargs): pass
                       if iface is not IReferenceable))
 
 
+@implementer(IATTopicCriterion)
 class ATBaseCriterion(NonRefCatalogContent):
     """A basic criterion"""
 
     security = ClassSecurityInfo()
 
-    implements(IATTopicCriterion)
-
     schema = ATBaseCriterionSchema
     meta_type = 'ATBaseCriterion'
     archetype_name = 'Base Criterion'

Products/ATContentTypes/criteria/boolean.py

@@ -12,7 +12,7 @@
 from Products.ATContentTypes.interfaces import IATTopicSearchCriterion
 from Products.ATContentTypes.permission import ChangeTopics
 from Products.CMFCore.permissions import View
-from zope.interface import implements
+from zope.interface import implementer
 
 
 ATBooleanCriterionSchema = ATBaseCriterionSchema + Schema((
@@ -30,11 +30,10 @@
 ))
 
 
+@implementer(IATTopicSearchCriterion)
 class ATBooleanCriterion(ATBaseCriterion):
     """A boolean criterion"""
 
-    implements(IATTopicSearchCriterion)
-
     security = ClassSecurityInfo()
     schema = ATBooleanCriterionSchema
     meta_type = 'ATBooleanCriterion'

Products/ATContentTypes/criteria/currentauthor.py

@@ -7,17 +7,16 @@
 from Products.ATContentTypes.interfaces import IATTopicSearchCriterion
 from Products.CMFCore.permissions import View
 from Products.CMFCore.utils import getToolByName
-from zope.interface import implements
+from zope.interface import implementer
 
 
 ATCurrentAuthorSchema = ATBaseCriterionSchema
 
 
+@implementer(IATTopicSearchCriterion)
 class ATCurrentAuthorCriterion(ATBaseCriterion):
     """A criterion that searches for the currently logged in user's id"""
 
-    implements(IATTopicSearchCriterion)
-
     security = ClassSecurityInfo()
     schema = ATCurrentAuthorSchema
     meta_type = 'ATCurrentAuthorCriterion'

Products/ATContentTypes/criteria/date.py

@@ -15,7 +15,7 @@
 from Products.ATContentTypes.interfaces import IATTopicSearchCriterion
 from Products.ATContentTypes.permission import ChangeTopics
 from Products.CMFCore.permissions import View
-from zope.interface import implements
+from zope.interface import implementer
 
 
 DateOptions = IntDisplayList((
@@ -97,11 +97,10 @@
 ))
 
 
+@implementer(IATTopicSearchCriterion)
 class ATDateCriteria(ATBaseCriterion):
     """A relative date criterion"""
 
-    implements(IATTopicSearchCriterion)
-
     security = ClassSecurityInfo()
     schema = ATDateCriteriaSchema
     meta_type = 'ATFriendlyDateCriteria'