Merged from master.

3 files changed, 3 insertions, 3 deletions

diff --git a/src/mailman/styles/base.py b/src/mailman/styles/base.py
index 07f6f57dc..9530b0ea3 100644
--- a/src/mailman/styles/base.py
+++ b/src/mailman/styles/base.py
@@ -24,7 +24,6 @@ methods in your compositional derived class.
 
 
 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
@@ -35,6 +34,7 @@ from mailman.interfaces.mailinglist import (
     DMARCModerationAction, FromIsList, Personalization, ReplyToMunging,
     SubscriptionPolicy)
 from mailman.interfaces.nntp import NewsgroupModeration
+from public import public
 
 
 @public
diff --git a/src/mailman/styles/default.py b/src/mailman/styles/default.py
index 2df075a6f..c7632fe8e 100644
--- a/src/mailman/styles/default.py
+++ b/src/mailman/styles/default.py
@@ -17,11 +17,11 @@
 
 """Application of list styles to new and existing lists."""
 
-from mailman import public
 from mailman.interfaces.styles import IStyle
 from mailman.styles.base import (
     Announcement, BasicOperation, Bounces, Discussion, Identity, Moderation,
     Public)
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/styles/manager.py b/src/mailman/styles/manager.py
index 1b3130581..ae60dc3c6 100644
--- a/src/mailman/styles/manager.py
+++ b/src/mailman/styles/manager.py
@@ -17,11 +17,11 @@
 
 """Style manager."""
 
-from mailman import public
 from mailman.interfaces.configuration import ConfigurationUpdatedEvent
 from mailman.interfaces.styles import (
     DuplicateStyleError, IStyle, IStyleManager)
 from mailman.utilities.modules import find_components
+from public import public
 from zope.component import getUtility
 from zope.interface import implementer
 from zope.interface.verify import verifyObject