trunk merge

13 files changed, 40 insertions, 40 deletions

diff --git a/src/mailman/rules/administrivia.py b/src/mailman/rules/administrivia.py
index 41c6edf30..4c49e4ff2 100644
--- a/src/mailman/rules/administrivia.py
+++ b/src/mailman/rules/administrivia.py
@@ -17,7 +17,7 @@
 
 """The administrivia rule."""
 
-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 email.iterators import typed_subpart_iterator
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.config import config
 from mailman.core.i18n import _
@@ -53,9 +53,9 @@ EMAIL_COMMANDS = {
 
 
 
+@implementer(IRule)
 class Administrivia:
     """The administrivia rule."""
-    implements(IRule)
 
     name = 'administrivia'
     description = _('Catch mis-addressed email commands.')
diff --git a/src/mailman/rules/any.py b/src/mailman/rules/any.py
index b0d147bec..33c20394d 100644
--- a/src/mailman/rules/any.py
+++ b/src/mailman/rules/any.py
@@ -17,7 +17,7 @@
 
 """Check if any previous rules have matched."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -25,16 +25,16 @@ __all__ = [
     ]
 
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 
 
 
+@implementer(IRule)
 class Any:
     """Look for any previous rule match."""
-    implements(IRule)
 
     name = 'any'
     description = _('Look for any previous rule hit.')
diff --git a/src/mailman/rules/approved.py b/src/mailman/rules/approved.py
index 3e2b7bc83..1f4fc1369 100644
--- a/src/mailman/rules/approved.py
+++ b/src/mailman/rules/approved.py
@@ -29,7 +29,7 @@ import re
 
 from email.iterators import typed_subpart_iterator
 from flufl.password import verify
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
@@ -45,9 +45,9 @@ HEADERS = [
 
 
 
+@implementer(IRule)
 class Approved:
     """Look for moderator pre-approval."""
-    implements(IRule)
 
     name = 'approved'
     description = _('The message has a matching Approve or Approved header.')
@@ -119,7 +119,7 @@ class Approved:
         else:
             for header in HEADERS:
                 del msg[header]
-        return (password is not missing and 
+        return (password is not missing and
                 verify(mlist.moderator_password, password))
 
 
diff --git a/src/mailman/rules/emergency.py b/src/mailman/rules/emergency.py
index 7b2100875..7c11b0aa3 100644
--- a/src/mailman/rules/emergency.py
+++ b/src/mailman/rules/emergency.py
@@ -17,7 +17,7 @@
 
 """The emergency hold rule."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -25,16 +25,16 @@ __all__ = [
     ]
 
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 
 
 
+@implementer(IRule)
 class Emergency:
     """The emergency hold rule."""
-    implements(IRule)
 
     name = 'emergency'
 
diff --git a/src/mailman/rules/implicit_dest.py b/src/mailman/rules/implicit_dest.py
index 321a1775d..41d0403bc 100644
--- a/src/mailman/rules/implicit_dest.py
+++ b/src/mailman/rules/implicit_dest.py
@@ -17,7 +17,7 @@
 
 """The implicit destination rule."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -27,7 +27,7 @@ __all__ = [
 
 import re
 from email.utils import getaddresses
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.mailinglist import IAcceptableAliasSet
@@ -35,9 +35,9 @@ from mailman.interfaces.rules import IRule
 
 
 
+@implementer(IRule)
 class ImplicitDestination:
     """The implicit destination rule."""
-    implements(IRule)
 
     name = 'implicit-dest'
     description = _('Catch messages with implicit destination.')
diff --git a/src/mailman/rules/loop.py b/src/mailman/rules/loop.py
index 9e4aa0061..9282b1705 100644
--- a/src/mailman/rules/loop.py
+++ b/src/mailman/rules/loop.py
@@ -17,7 +17,7 @@
 
 """Look for a posting loop."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -25,16 +25,16 @@ __all__ = [
     ]
 
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 
 
 
+@implementer(IRule)
 class Loop:
     """Look for a posting loop."""
-    implements(IRule)
 
     name = 'loop'
     description = _('Look for a posting loop.')
diff --git a/src/mailman/rules/max_recipients.py b/src/mailman/rules/max_recipients.py
index 79396c72f..fd09114e2 100644
--- a/src/mailman/rules/max_recipients.py
+++ b/src/mailman/rules/max_recipients.py
@@ -17,7 +17,7 @@
 
 """The maximum number of recipients rule."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -26,16 +26,16 @@ __all__ = [
 
 
 from email.utils import getaddresses
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 
 
 
+@implementer(IRule)
 class MaximumRecipients:
     """The maximum number of recipients rule."""
-    implements(IRule)
 
     name = 'max-recipients'
     description = _('Catch messages with too many explicit recipients.')
diff --git a/src/mailman/rules/max_size.py b/src/mailman/rules/max_size.py
index 420d63571..a67d87771 100644
--- a/src/mailman/rules/max_size.py
+++ b/src/mailman/rules/max_size.py
@@ -17,7 +17,7 @@
 
 """The maximum message size rule."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -25,16 +25,16 @@ __all__ = [
     ]
 
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 
 
 
+@implementer(IRule)
 class MaximumSize:
     """The implicit destination rule."""
-    implements(IRule)
 
     name = 'max-size'
     description = _('Catch messages that are bigger than a specified maximum.')
diff --git a/src/mailman/rules/moderation.py b/src/mailman/rules/moderation.py
index cb27d89d8..b2c777dc7 100644
--- a/src/mailman/rules/moderation.py
+++ b/src/mailman/rules/moderation.py
@@ -17,7 +17,7 @@
 
 """Membership related rules."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -27,7 +27,7 @@ __all__ = [
 
 
 from zope.component import getUtility
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.action import Action
@@ -37,9 +37,9 @@ from mailman.interfaces.usermanager import IUserManager
 
 
 
+@implementer(IRule)
 class MemberModeration:
     """The member moderation rule."""
-    implements(IRule)
 
     name = 'member-moderation'
     description = _('Match messages sent by moderated members.')
@@ -65,9 +65,9 @@ class MemberModeration:
 
 
 
+@implementer(IRule)
 class NonmemberModeration:
     """The nonmember moderation rule."""
-    implements(IRule)
 
     name = 'nonmember-moderation'
     description = _('Match messages sent by nonmembers.')
diff --git a/src/mailman/rules/news_moderation.py b/src/mailman/rules/news_moderation.py
index e43bca3b7..bd6eb6166 100644
--- a/src/mailman/rules/news_moderation.py
+++ b/src/mailman/rules/news_moderation.py
@@ -17,7 +17,7 @@
 
 """The news moderation rule."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -25,7 +25,7 @@ __all__ = [
     ]
 
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.nntp import NewsgroupModeration
@@ -33,9 +33,9 @@ from mailman.interfaces.rules import IRule
 
 
 
+@implementer(IRule)
 class ModeratedNewsgroup:
     """The news moderation rule."""
-    implements(IRule)
 
     name = 'news-moderation'
     description = _(
diff --git a/src/mailman/rules/no_subject.py b/src/mailman/rules/no_subject.py
index 1a2bab1d5..1fd0dfb8b 100644
--- a/src/mailman/rules/no_subject.py
+++ b/src/mailman/rules/no_subject.py
@@ -17,7 +17,7 @@
 
 """The no-Subject header rule."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -25,16 +25,16 @@ __all__ = [
     ]
 
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 
 
 
+@implementer(IRule)
 class NoSubject:
     """The no-Subject rule."""
-    implements(IRule)
 
     name = 'no-subject'
     description = _('Catch messages with no, or empty, Subject headers.')
diff --git a/src/mailman/rules/suspicious.py b/src/mailman/rules/suspicious.py
index ad1ab42cd..75fe0afab 100644
--- a/src/mailman/rules/suspicious.py
+++ b/src/mailman/rules/suspicious.py
@@ -17,7 +17,7 @@
 
 """The historical 'suspicious header' rule."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -28,7 +28,7 @@ __all__ = [
 import re
 import logging
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
@@ -37,9 +37,9 @@ log = logging.getLogger('mailman.error')
 
 
 
+@implementer(IRule)
 class SuspiciousHeader:
     """The historical 'suspicious header' rule."""
-    implements(IRule)
 
     name = 'suspicious-header'
     description = _('Catch messages with suspicious headers.')
diff --git a/src/mailman/rules/truth.py b/src/mailman/rules/truth.py
index 20c152e4d..752618ced 100644
--- a/src/mailman/rules/truth.py
+++ b/src/mailman/rules/truth.py
@@ -17,7 +17,7 @@
 
 """A rule which always matches."""
 
-from __future__ import absolute_import, unicode_literals
+from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
@@ -25,16 +25,16 @@ __all__ = [
     ]
 
 
-from zope.interface import implements
+from zope.interface import implementer
 
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 
 
 
+@implementer(IRule)
 class Truth:
     """Look for any previous rule match."""
-    implements(IRule)
 
     name = 'truth'
     description = _('A rule which always matches.')