9 files changed, 9 insertions, 9 deletions

diff --git a/src/mailman/chains/accept.py b/src/mailman/chains/accept.py
index 8b0a0507e..c245927bf 100644
--- a/src/mailman/chains/accept.py
+++ b/src/mailman/chains/accept.py
@@ -19,11 +19,11 @@
 
 import logging
 
-from mailman import public
 from mailman.chains.base import TerminalChainBase
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.chain import AcceptEvent
+from public import public
 from zope.event import notify
 
 
diff --git a/src/mailman/chains/base.py b/src/mailman/chains/base.py
index 677ec501c..d54baf8b6 100644
--- a/src/mailman/chains/base.py
+++ b/src/mailman/chains/base.py
@@ -17,11 +17,11 @@
 
 """Base class for terminal chains."""
 
-from mailman import public
 from mailman.config import config
 from mailman.interfaces.chain import (
     IChain, IChainIterator, IChainLink, IMutableChain, LinkAction)
 from mailman.interfaces.rules import IRule
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/chains/builtin.py b/src/mailman/chains/builtin.py
index b805fca0f..16de1043a 100644
--- a/src/mailman/chains/builtin.py
+++ b/src/mailman/chains/builtin.py
@@ -19,10 +19,10 @@
 
 import logging
 
-from mailman import public
 from mailman.chains.base import Link
 from mailman.core.i18n import _
 from mailman.interfaces.chain import IChain, LinkAction
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/chains/discard.py b/src/mailman/chains/discard.py
index f77c7eb0f..e9fc8d05d 100644
--- a/src/mailman/chains/discard.py
+++ b/src/mailman/chains/discard.py
@@ -19,10 +19,10 @@
 
 import logging
 
-from mailman import public
 from mailman.chains.base import TerminalChainBase
 from mailman.core.i18n import _
 from mailman.interfaces.chain import DiscardEvent
+from public import public
 from zope.event import notify
 
 
diff --git a/src/mailman/chains/headers.py b/src/mailman/chains/headers.py
index 5698740d3..56ac179e9 100644
--- a/src/mailman/chains/headers.py
+++ b/src/mailman/chains/headers.py
@@ -21,12 +21,12 @@ import re
 import logging
 
 from itertools import count
-from mailman import public
 from mailman.chains.base import Chain, Link
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.chain import LinkAction
 from mailman.interfaces.rules import IRule
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/chains/hold.py b/src/mailman/chains/hold.py
index a44bd6a0c..86761c3e1 100644
--- a/src/mailman/chains/hold.py
+++ b/src/mailman/chains/hold.py
@@ -22,7 +22,6 @@ import logging
 from email.mime.message import MIMEMessage
 from email.mime.text import MIMEText
 from email.utils import formatdate, make_msgid
-from mailman import public
 from mailman.app.moderator import hold_message
 from mailman.app.replybot import can_acknowledge
 from mailman.chains.base import TerminalChainBase
@@ -36,6 +35,7 @@ from mailman.interfaces.pending import IPendable, IPendings
 from mailman.interfaces.template import ITemplateLoader
 from mailman.interfaces.usermanager import IUserManager
 from mailman.utilities.string import expand, oneline, wrap
+from public import public
 from zope.component import getUtility
 from zope.event import notify
 from zope.interface import implementer
diff --git a/src/mailman/chains/moderation.py b/src/mailman/chains/moderation.py
index 9bb4bf0d5..e8f507603 100644
--- a/src/mailman/chains/moderation.py
+++ b/src/mailman/chains/moderation.py
@@ -34,11 +34,11 @@ made as to the disposition of the message.  `defer` is the default for
 members, while `hold` is the default for nonmembers.
 """
 
-from mailman import public
 from mailman.chains.base import Link
 from mailman.core.i18n import _
 from mailman.interfaces.action import Action
 from mailman.interfaces.chain import IChain, LinkAction
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/chains/owner.py b/src/mailman/chains/owner.py
index f7454435f..4fb8e1723 100644
--- a/src/mailman/chains/owner.py
+++ b/src/mailman/chains/owner.py
@@ -19,11 +19,11 @@
 
 import logging
 
-from mailman import public
 from mailman.chains.base import TerminalChainBase
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.chain import AcceptOwnerEvent
+from public import public
 from zope.event import notify
 
 
diff --git a/src/mailman/chains/reject.py b/src/mailman/chains/reject.py
index 27fce8d4e..96be8f2de 100644
--- a/src/mailman/chains/reject.py
+++ b/src/mailman/chains/reject.py
@@ -19,12 +19,12 @@
 
 import logging
 
-from mailman import public
 from mailman.app.bounces import bounce_message
 from mailman.chains.base import TerminalChainBase
 from mailman.core.i18n import _
 from mailman.interfaces.chain import RejectEvent
 from mailman.interfaces.pipeline import RejectMessage
+from public import public
 from zope.event import notify