4 files changed, 17 insertions, 42 deletions

diff --git a/src/mailman/styles/base.py b/src/mailman/styles/base.py
index e0be92ee5..e6f8e182f 100644
--- a/src/mailman/styles/base.py
+++ b/src/mailman/styles/base.py
@@ -23,18 +23,8 @@ methods in your compositional derived class.
 """
 
 
-__all__ = [
-    'Announcement',
-    'BasicOperation',
-    'Bounces',
-    'Discussion',
-    'Identity',
-    'Moderation',
-    'Public',
-    ]
-
-
 from datetime import timedelta
+from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.action import Action, FilterAction
 from mailman.interfaces.archiver import ArchivePolicy
@@ -46,7 +36,7 @@ from mailman.interfaces.mailinglist import (
 from mailman.interfaces.nntp import NewsgroupModeration
 
 
-
+@public
 class Identity:
     """Set basic identify attributes."""
 
@@ -65,7 +55,7 @@ class Identity:
             mlist.preferred_language.charset != 'us-ascii')
 
 
-
+@public
 class BasicOperation:
     """Set basic operational attributes."""
 
@@ -90,7 +80,7 @@ class BasicOperation:
         mlist.digests_enabled = True
         mlist.digest_is_default = False
         mlist.mime_is_default_digest = False
-        mlist.digest_size_threshold = 30 # KB
+        mlist.digest_size_threshold = 30          # KB
         mlist.digest_send_periodic = True
         mlist.digest_header_uri = None
         mlist.digest_footer_uri = (
@@ -144,7 +134,7 @@ class BasicOperation:
         mlist.scrub_nondigest = False
 
 
-
+@public
 class Bounces:
     """Basic bounce processing."""
 
@@ -189,7 +179,7 @@ class Bounces:
         mlist.owner_pipeline = 'default-owner-pipeline'
 
 
-
+@public
 class Public:
     """Settings for public mailing lists."""
 
@@ -203,7 +193,7 @@ class Public:
         mlist.archive_policy = ArchivePolicy.public
 
 
-
+@public
 class Announcement:
     """Settings for announce-only lists."""
 
@@ -218,6 +208,7 @@ class Announcement:
         mlist.goodbye_message_uri = ''
 
 
+@public
 class Discussion:
     """Settings for standard discussion lists."""
 
@@ -232,7 +223,7 @@ class Discussion:
         mlist.goodbye_message_uri = ''
 
 
-
+@public
 class Moderation:
     """Settings for basic moderation."""
 
@@ -240,7 +231,7 @@ class Moderation:
         # For cut-n-paste convenience.
         mlist = mailing_list
         mlist.max_num_recipients = 10
-        mlist.max_message_size = 40 # KB
+        mlist.max_message_size = 40               # KB
         mlist.require_explicit_destination = True
         mlist.bounce_matching_headers = """
 # Lines that *start* with a '#' are comments.
diff --git a/src/mailman/styles/default.py b/src/mailman/styles/default.py
index 51a1812bd..2df075a6f 100644
--- a/src/mailman/styles/default.py
+++ b/src/mailman/styles/default.py
@@ -17,12 +17,7 @@
 
 """Application of list styles to new and existing lists."""
 
-__all__ = [
-    'LegacyDefaultStyle',
-    'LegacyAnnounceOnly',
-    ]
-
-
+from mailman import public
 from mailman.interfaces.styles import IStyle
 from mailman.styles.base import (
     Announcement, BasicOperation, Bounces, Discussion, Identity, Moderation,
@@ -30,7 +25,7 @@ from mailman.styles.base import (
 from zope.interface import implementer
 
 
-
+@public
 @implementer(IStyle)
 class LegacyDefaultStyle(
         Identity, BasicOperation, Bounces, Public, Discussion, Moderation):
@@ -49,6 +44,7 @@ class LegacyDefaultStyle(
         Moderation.apply(self, mailing_list)
 
 
+@public
 @implementer(IStyle)
 class LegacyAnnounceOnly(
         Identity, BasicOperation, Bounces, Public, Announcement, Moderation):
diff --git a/src/mailman/styles/manager.py b/src/mailman/styles/manager.py
index a4d989046..1b3130581 100644
--- a/src/mailman/styles/manager.py
+++ b/src/mailman/styles/manager.py
@@ -17,12 +17,7 @@
 
 """Style manager."""
 
-__all__ = [
-    'StyleManager',
-    'handle_ConfigurationUpdatedEvent',
-    ]
-
-
+from mailman import public
 from mailman.interfaces.configuration import ConfigurationUpdatedEvent
 from mailman.interfaces.styles import (
     DuplicateStyleError, IStyle, IStyleManager)
@@ -32,7 +27,7 @@ from zope.interface import implementer
 from zope.interface.verify import verifyObject
 
 
-
+@public
 @implementer(IStyleManager)
 class StyleManager:
     """The built-in style manager."""
@@ -53,7 +48,7 @@ class StyleManager:
                 style = style_class()
                 verifyObject(IStyle, style)
                 assert style.name not in self._styles, (
-                    'Duplicate style "{0}" found in {1}'.format(
+                    'Duplicate style "{}" found in {}'.format(
                         style.name, style_class))
                 self._styles[style.name] = style
 
@@ -80,7 +75,7 @@ class StyleManager:
         del self._styles[style.name]
 
 
-
+@public
 def handle_ConfigurationUpdatedEvent(event):
     if isinstance(event, ConfigurationUpdatedEvent):
         getUtility(IStyleManager).populate()
diff --git a/src/mailman/styles/tests/test_styles.py b/src/mailman/styles/tests/test_styles.py
index a54b779b2..657433aee 100644
--- a/src/mailman/styles/tests/test_styles.py
+++ b/src/mailman/styles/tests/test_styles.py
@@ -17,11 +17,6 @@
 
 """Test styles."""
 
-__all__ = [
-    'TestStyle',
-    ]
-
-
 import unittest
 
 from mailman.interfaces.styles import (
@@ -32,7 +27,6 @@ from zope.interface import implementer
 from zope.interface.exceptions import DoesNotImplement
 
 
-
 @implementer(IStyle)
 class DummyStyle:
 
@@ -46,7 +40,6 @@ class DummyStyle:
         styles.append(self)
 
 
-
 class TestStyle(unittest.TestCase):
     """Test styles."""