13 files changed, 30 insertions, 57 deletions

diff --git a/src/mailman/rules/administrivia.py b/src/mailman/rules/administrivia.py
index b4656d33f..e5defee6e 100644
--- a/src/mailman/rules/administrivia.py
+++ b/src/mailman/rules/administrivia.py
@@ -18,16 +18,12 @@
 """The administrivia rule."""
 
 from email.iterators import typed_subpart_iterator
+from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 from zope.interface import implementer
 
-__all__ = [
-    'Administrivia',
-    ]
-
-
 # The list of email commands we search for in the Subject header and payload.
 # We probably should get this information from the actual implemented
 # commands.
@@ -47,6 +43,7 @@ EMAIL_COMMANDS = {
     }
 
 
+@public
 @implementer(IRule)
 class Administrivia:
     """The administrivia rule."""
diff --git a/src/mailman/rules/any.py b/src/mailman/rules/any.py
index 67504875c..466735ebe 100644
--- a/src/mailman/rules/any.py
+++ b/src/mailman/rules/any.py
@@ -17,15 +17,13 @@
 
 """Check if any previous rules have matched."""
 
+from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 from zope.interface import implementer
 
-__all__ = [
-    'Any',
-    ]
-
 
+@public
 @implementer(IRule)
 class Any:
     """Look for any previous rule match."""
diff --git a/src/mailman/rules/approved.py b/src/mailman/rules/approved.py
index cb3b98915..a4ea1145e 100644
--- a/src/mailman/rules/approved.py
+++ b/src/mailman/rules/approved.py
@@ -20,15 +20,12 @@
 import re
 
 from email.iterators import typed_subpart_iterator
+from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 from zope.interface import implementer
 
-__all__ = [
-    'Approved',
-    ]
-
 
 EMPTYSTRING = ''
 HEADERS = [
@@ -39,6 +36,7 @@ HEADERS = [
     ]
 
 
+@public
 @implementer(IRule)
 class Approved:
     """Look for moderator pre-approval."""
diff --git a/src/mailman/rules/emergency.py b/src/mailman/rules/emergency.py
index f6dacfe37..442ccf136 100644
--- a/src/mailman/rules/emergency.py
+++ b/src/mailman/rules/emergency.py
@@ -17,15 +17,13 @@
 
 """The emergency hold rule."""
 
+from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 from zope.interface import implementer
 
-__all__ = [
-    'Emergency',
-    ]
-
 
+@public
 @implementer(IRule)
 class Emergency:
     """The emergency hold rule."""
diff --git a/src/mailman/rules/implicit_dest.py b/src/mailman/rules/implicit_dest.py
index 6d75ba637..621ad3e22 100644
--- a/src/mailman/rules/implicit_dest.py
+++ b/src/mailman/rules/implicit_dest.py
@@ -20,16 +20,14 @@
 import re
 
 from email.utils import getaddresses
+from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.mailinglist import IAcceptableAliasSet
 from mailman.interfaces.rules import IRule
 from zope.interface import implementer
 
-__all__ = [
-    'ImplicitDestination',
-    ]
-
 
+@public
 @implementer(IRule)
 class ImplicitDestination:
     """The implicit destination rule."""
diff --git a/src/mailman/rules/loop.py b/src/mailman/rules/loop.py
index 280939a74..0f8047e76 100644
--- a/src/mailman/rules/loop.py
+++ b/src/mailman/rules/loop.py
@@ -17,15 +17,13 @@
 
 """Look for a posting loop."""
 
+from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 from zope.interface import implementer
 
-__all__ = [
-    'Loop',
-    ]
-
 
+@public
 @implementer(IRule)
 class Loop:
     """Look for a posting loop."""
diff --git a/src/mailman/rules/max_recipients.py b/src/mailman/rules/max_recipients.py
index 3d4fa139f..61df613cb 100644
--- a/src/mailman/rules/max_recipients.py
+++ b/src/mailman/rules/max_recipients.py
@@ -18,15 +18,13 @@
 """The maximum number of recipients rule."""
 
 from email.utils import getaddresses
+from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 from zope.interface import implementer
 
-__all__ = [
-    'MaximumRecipients',
-    ]
-
 
+@public
 @implementer(IRule)
 class MaximumRecipients:
     """The maximum number of recipients rule."""
diff --git a/src/mailman/rules/max_size.py b/src/mailman/rules/max_size.py
index 0ed781a38..8911e97fd 100644
--- a/src/mailman/rules/max_size.py
+++ b/src/mailman/rules/max_size.py
@@ -17,15 +17,13 @@
 
 """The maximum message size rule."""
 
+from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 from zope.interface import implementer
 
-__all__ = [
-    'MaximumSize',
-    ]
-
 
+@public
 @implementer(IRule)
 class MaximumSize:
     """The implicit destination rule."""
diff --git a/src/mailman/rules/moderation.py b/src/mailman/rules/moderation.py
index b89e7c9c2..fdecd1d5f 100644
--- a/src/mailman/rules/moderation.py
+++ b/src/mailman/rules/moderation.py
@@ -19,6 +19,7 @@
 
 import re
 
+from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.action import Action
 from mailman.interfaces.member import MemberRole
@@ -27,12 +28,8 @@ from mailman.interfaces.usermanager import IUserManager
 from zope.component import getUtility
 from zope.interface import implementer
 
-__all__ = [
-    'MemberModeration',
-    'NonmemberModeration',
-    ]
-
 
+@public
 @implementer(IRule)
 class MemberModeration:
     """The member moderation rule."""
@@ -69,6 +66,7 @@ def _record_action(msgdata, action, sender, reason):
     msgdata.setdefault('moderation_reasons', []).append(reason)
 
 
+@public
 @implementer(IRule)
 class NonmemberModeration:
     """The nonmember moderation rule."""
@@ -89,7 +87,7 @@ class NonmemberModeration:
                 # The address is neither a member nor nonmember.
                 address = user_manager.get_address(sender)
                 assert address is not None, (
-                    'Posting address is not registered: {0}'.format(sender))
+                    'Posting address is not registered: {}'.format(sender))
                 mlist.subscribe(address, MemberRole.nonmember)
         # If a member is found, the member-moderation rule takes precedence.
         for sender in msg.senders:
@@ -99,7 +97,7 @@ class NonmemberModeration:
         for sender in msg.senders:
             nonmember = mlist.nonmembers.get_member(sender)
             assert nonmember is not None, (
-                'Sender not added to the nonmembers: {0}'.format(sender))
+                'Sender not added to the nonmembers: {}'.format(sender))
             # Check the '*_these_nonmembers' properties first.  XXX These are
             # legacy attributes from MM2.1; their database type is 'pickle' and
             # they should eventually get replaced.
@@ -108,7 +106,7 @@ class NonmemberModeration:
                 checklist = getattr(mlist, legacy_attribute_name)
                 for addr in checklist:
                     if ((addr.startswith('^') and re.match(addr, sender))
-                            or addr == sender):
+                            or addr == sender):     # flake8: noqa
                         # The reason will get translated at the point of use.
                         reason = 'The sender is in the nonmember {} list'
                         _record_action(msgdata, action, sender,
diff --git a/src/mailman/rules/news_moderation.py b/src/mailman/rules/news_moderation.py
index 2feeed4a1..63a7e93b0 100644
--- a/src/mailman/rules/news_moderation.py
+++ b/src/mailman/rules/news_moderation.py
@@ -17,16 +17,14 @@
 
 """The news moderation rule."""
 
+from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.nntp import NewsgroupModeration
 from mailman.interfaces.rules import IRule
 from zope.interface import implementer
 
-__all__ = [
-    'ModeratedNewsgroup',
-    ]
-
 
+@public
 @implementer(IRule)
 class ModeratedNewsgroup:
     """The news moderation rule."""
diff --git a/src/mailman/rules/no_subject.py b/src/mailman/rules/no_subject.py
index ff63d8c37..4b53067a5 100644
--- a/src/mailman/rules/no_subject.py
+++ b/src/mailman/rules/no_subject.py
@@ -17,15 +17,13 @@
 
 """The no-Subject header rule."""
 
+from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 from zope.interface import implementer
 
-__all__ = [
-    'NoSubject',
-    ]
-
 
+@public
 @implementer(IRule)
 class NoSubject:
     """The no-Subject rule."""
diff --git a/src/mailman/rules/suspicious.py b/src/mailman/rules/suspicious.py
index d385ea490..f349a313e 100644
--- a/src/mailman/rules/suspicious.py
+++ b/src/mailman/rules/suspicious.py
@@ -20,18 +20,16 @@
 import re
 import logging
 
+from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 from zope.interface import implementer
 
-__all__ = [
-    'SuspiciousHeader',
-    ]
-
 
 log = logging.getLogger('mailman.error')
 
 
+@public
 @implementer(IRule)
 class SuspiciousHeader:
     """The historical 'suspicious header' rule."""
diff --git a/src/mailman/rules/truth.py b/src/mailman/rules/truth.py
index 16b2e1893..9883a0e60 100644
--- a/src/mailman/rules/truth.py
+++ b/src/mailman/rules/truth.py
@@ -17,15 +17,13 @@
 
 """A rule which always matches."""
 
+from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.rules import IRule
 from zope.interface import implementer
 
-__all__ = [
-    'Truth',
-    ]
-
 
+@public
 @implementer(IRule)
 class Truth:
     """Look for any previous rule match."""