11 files changed, 11 insertions, 11 deletions

diff --git a/src/mailman/mta/aliases.py b/src/mailman/mta/aliases.py
index dc434c613..889375c04 100644
--- a/src/mailman/mta/aliases.py
+++ b/src/mailman/mta/aliases.py
@@ -17,8 +17,8 @@
 
 """Utility for generating all the aliases of a mailing list."""
 
-from mailman import public
 from mailman.interfaces.mta import IMailTransportAgentAliases
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/mta/base.py b/src/mailman/mta/base.py
index 679faefd5..4f5bb1d58 100644
--- a/src/mailman/mta/base.py
+++ b/src/mailman/mta/base.py
@@ -22,10 +22,10 @@ import socket
 import logging
 import smtplib
 
-from mailman import public
 from mailman.config import config
 from mailman.interfaces.mta import IMailTransportAgentDelivery
 from mailman.mta.connection import Connection
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/mta/bulk.py b/src/mailman/mta/bulk.py
index 1741e0d4c..91b04957a 100644
--- a/src/mailman/mta/bulk.py
+++ b/src/mailman/mta/bulk.py
@@ -17,8 +17,8 @@
 
 """Bulk message delivery."""
 
-from mailman import public
 from mailman.mta.base import BaseDelivery
+from public import public
 
 
 # A mapping of top-level domains to bucket numbers.  The zeroth bucket is
diff --git a/src/mailman/mta/connection.py b/src/mailman/mta/connection.py
index 44cc31d86..318bc5e8e 100644
--- a/src/mailman/mta/connection.py
+++ b/src/mailman/mta/connection.py
@@ -22,8 +22,8 @@ import smtplib
 
 from contextlib import suppress
 from lazr.config import as_boolean
-from mailman import public
 from mailman.config import config
+from public import public
 
 
 log = logging.getLogger('mailman.smtp')
diff --git a/src/mailman/mta/decorating.py b/src/mailman/mta/decorating.py
index e9d6f5785..32db852da 100644
--- a/src/mailman/mta/decorating.py
+++ b/src/mailman/mta/decorating.py
@@ -17,9 +17,9 @@
 
 """Individualized delivery with header/footer decorations."""
 
-from mailman import public
 from mailman.config import config
 from mailman.mta.verp import VERPDelivery
+from public import public
 
 
 @public
diff --git a/src/mailman/mta/deliver.py b/src/mailman/mta/deliver.py
index a5a4e2433..7624979bf 100644
--- a/src/mailman/mta/deliver.py
+++ b/src/mailman/mta/deliver.py
@@ -20,7 +20,6 @@
 import time
 import logging
 
-from mailman import public
 from mailman.config import config
 from mailman.interfaces.mailinglist import Personalization
 from mailman.interfaces.mta import SomeRecipientsFailed
@@ -30,6 +29,7 @@ from mailman.mta.decorating import DecoratingMixin
 from mailman.mta.personalized import PersonalizedMixin
 from mailman.mta.verp import VERPMixin
 from mailman.utilities.string import expand
+from public import public
 
 
 COMMA = ','
diff --git a/src/mailman/mta/exim4.py b/src/mailman/mta/exim4.py
index 7151768a8..ec2e77708 100644
--- a/src/mailman/mta/exim4.py
+++ b/src/mailman/mta/exim4.py
@@ -17,8 +17,8 @@
 
 """Creation/deletion hooks for the Exim4 MTA."""
 
-from mailman import public
 from mailman.interfaces.mta import IMailTransportAgentLifecycle
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/mta/null.py b/src/mailman/mta/null.py
index 165c5f0ee..e5368e689 100644
--- a/src/mailman/mta/null.py
+++ b/src/mailman/mta/null.py
@@ -20,8 +20,8 @@
 Exim one example of an MTA that Just Works.
 """
 
-from mailman import public
 from mailman.interfaces.mta import IMailTransportAgentLifecycle
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/mta/personalized.py b/src/mailman/mta/personalized.py
index 7cfbfff43..01ba686f3 100644
--- a/src/mailman/mta/personalized.py
+++ b/src/mailman/mta/personalized.py
@@ -19,10 +19,10 @@
 
 from email.header import Header
 from email.utils import formataddr
-from mailman import public
 from mailman.interfaces.mailinglist import Personalization
 from mailman.interfaces.usermanager import IUserManager
 from mailman.mta.verp import VERPDelivery
+from public import public
 from zope.component import getUtility
 
 
diff --git a/src/mailman/mta/postfix.py b/src/mailman/mta/postfix.py
index ff4b92117..07bf17a22 100644
--- a/src/mailman/mta/postfix.py
+++ b/src/mailman/mta/postfix.py
@@ -21,7 +21,6 @@ import os
 import logging
 
 from flufl.lock import Lock
-from mailman import public
 from mailman.config import config
 from mailman.config.config import external_configuration
 from mailman.interfaces.listmanager import IListManager
@@ -29,6 +28,7 @@ from mailman.interfaces.mta import (
     IMailTransportAgentAliases, IMailTransportAgentLifecycle)
 from mailman.utilities.datetime import now
 from operator import attrgetter
+from public import public
 from zope.component import getUtility
 from zope.interface import implementer
 
diff --git a/src/mailman/mta/verp.py b/src/mailman/mta/verp.py
index 8ede6cb67..6ce80c795 100644
--- a/src/mailman/mta/verp.py
+++ b/src/mailman/mta/verp.py
@@ -19,11 +19,11 @@
 
 import logging
 
-from mailman import public
 from mailman.config import config
 from mailman.mta.base import IndividualDelivery
 from mailman.utilities.email import split_email
 from mailman.utilities.string import expand
+from public import public
 
 
 DOT = '.'