General code cleanup.

 - Add explicit dependency on zope.event in setup.py.
 - Use Python 3 compatible syntax for specifying that a class implements an
   interface, i.e. the @implementer class decorator.
 - print_function futures.
 - Whitespace normalization.

4 files changed, 11 insertions, 13 deletions

diff --git a/src/mailman/styles/default.py b/src/mailman/styles/default.py
index b6900dca6..ef94dd4e6 100644
--- a/src/mailman/styles/default.py
+++ b/src/mailman/styles/default.py
@@ -17,7 +17,7 @@
 
 """Application of list styles to new and existing lists."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -28,7 +28,7 @@ __all__ = [
 # XXX Styles need to be reconciled with lazr.config.
 
 from datetime import timedelta
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.action import Action, FilterAction
@@ -41,11 +41,10 @@ from mailman.interfaces.styles import IStyle
 
 
 
+@implementer(IStyle)
 class DefaultStyle:
     """The default (i.e. legacy) style."""
 
-    implements(IStyle)
-
     name = 'default'
     priority = 0    # the lowest priority style
 
diff --git a/src/mailman/styles/docs/styles.rst b/src/mailman/styles/docs/styles.rst
index 90a02227b..8f589f10b 100644
--- a/src/mailman/styles/docs/styles.rst
+++ b/src/mailman/styles/docs/styles.rst
@@ -62,10 +62,10 @@ Registering styles
 
 New styles must implement the ``IStyle`` interface.
 
-    >>> from zope.interface import implements
+    >>> from zope.interface import implementer
     >>> from mailman.interfaces.styles import IStyle
-    >>> class TestStyle:
-    ...     implements(IStyle)
+    >>> @implementer(IStyle)
+    ... class TestStyle:
     ...     name = 'test'
     ...     priority = 10
     ...     def apply(self, mailing_list):
diff --git a/src/mailman/styles/manager.py b/src/mailman/styles/manager.py
index f1d3f1dfb..8ec832f18 100644
--- a/src/mailman/styles/manager.py
+++ b/src/mailman/styles/manager.py
@@ -17,7 +17,7 @@
 
 """Style manager."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -26,7 +26,7 @@ __all__ = [
 
 
 from operator import attrgetter
-from zope.interface import implements
+from zope.interface import implementer
 from zope.interface.verify import verifyObject
 
 from mailman.interfaces.styles import (
@@ -35,11 +35,10 @@ from mailman.utilities.modules import call_name
 
 
 
+@implementer(IStyleManager)
 class StyleManager:
     """The built-in style manager."""
 
-    implements(IStyleManager)
-
     def __init__(self):
         """Install all styles from the configuration files."""
         self._styles = {}
diff --git a/src/mailman/styles/tests/test_styles.py b/src/mailman/styles/tests/test_styles.py
index ce8b5064d..990ce541f 100644
--- a/src/mailman/styles/tests/test_styles.py
+++ b/src/mailman/styles/tests/test_styles.py
@@ -28,7 +28,7 @@ __all__ = [
 import unittest
 
 from zope.component import getUtility
-from zope.interface import implements
+from zope.interface import implementer
 from zope.interface.exceptions import DoesNotImplement
 
 from mailman.interfaces.styles import (
@@ -37,8 +37,8 @@ from mailman.testing.layers import ConfigLayer
 
 
 
+@implementer(IStyle)
 class DummyStyle:
-    implements(IStyle)
 
     name = 'dummy'
     priority = 1