Use `atpublic` for @public instead of internal copy.

11 files changed, 11 insertions, 11 deletions

diff --git a/src/mailman/core/api.py b/src/mailman/core/api.py
index e6e013af0..c9e377bbf 100644
--- a/src/mailman/core/api.py
+++ b/src/mailman/core/api.py
@@ -18,9 +18,9 @@
 """REST web service API contexts."""
 
 from lazr.config import as_boolean
-from mailman import public
 from mailman.config import config
 from mailman.interfaces.api import IAPI
+from public import public
 from uuid import UUID
 from zope.interface import implementer
 
diff --git a/src/mailman/core/chains.py b/src/mailman/core/chains.py
index ec84db2c4..0af61fd2a 100644
--- a/src/mailman/core/chains.py
+++ b/src/mailman/core/chains.py
@@ -17,11 +17,11 @@
 
 """Application support for chain processing."""
 
-from mailman import public
 from mailman.chains.base import Chain, TerminalChainBase
 from mailman.config import config
 from mailman.interfaces.chain import IChain, LinkAction
 from mailman.utilities.modules import find_components
+from public import public
 from zope.interface.verify import verifyObject
 
 
diff --git a/src/mailman/core/constants.py b/src/mailman/core/constants.py
index f82783e9f..e5d265256 100644
--- a/src/mailman/core/constants.py
+++ b/src/mailman/core/constants.py
@@ -17,11 +17,11 @@
 
 """Various constants and enumerations."""
 
-from mailman import public
 from mailman.config import config
 from mailman.interfaces.languages import ILanguageManager
 from mailman.interfaces.member import DeliveryMode, DeliveryStatus
 from mailman.interfaces.preferences import IPreferences
+from public import public
 from zope.component import getUtility
 from zope.interface import implementer
 
diff --git a/src/mailman/core/i18n.py b/src/mailman/core/i18n.py
index 5536fcdaf..345020a13 100644
--- a/src/mailman/core/i18n.py
+++ b/src/mailman/core/i18n.py
@@ -20,8 +20,8 @@
 import mailman.messages
 
 from flufl.i18n import PackageStrategy, registry
-from mailman import public
 from mailman.interfaces.configuration import ConfigurationUpdatedEvent
+from public import public
 
 
 public(_=None)
diff --git a/src/mailman/core/initialize.py b/src/mailman/core/initialize.py
index 7b39465c5..6bd1d6777 100644
--- a/src/mailman/core/initialize.py
+++ b/src/mailman/core/initialize.py
@@ -29,10 +29,10 @@ import sys
 import mailman.config.config
 import mailman.core.logging
 
-from mailman import public
 from mailman.interfaces.database import IDatabaseFactory
 from mailman.utilities.modules import call_name
 from pkg_resources import resource_string as resource_bytes
+from public import public
 from zope.component import getUtility
 from zope.configuration import xmlconfig
 
diff --git a/src/mailman/core/logging.py b/src/mailman/core/logging.py
index a7e8b2554..53bb2cf1c 100644
--- a/src/mailman/core/logging.py
+++ b/src/mailman/core/logging.py
@@ -23,8 +23,8 @@ import codecs
 import logging
 
 from lazr.config import as_boolean, as_log_level
-from mailman import public
 from mailman.config import config
+from public import public
 
 
 _handlers = {}
diff --git a/src/mailman/core/pipelines.py b/src/mailman/core/pipelines.py
index 5df21ed15..fb663cee9 100644
--- a/src/mailman/core/pipelines.py
+++ b/src/mailman/core/pipelines.py
@@ -19,7 +19,6 @@
 
 import logging
 
-from mailman import public
 from mailman.app.bounces import bounce_message
 from mailman.config import config
 from mailman.core.i18n import _
@@ -27,6 +26,7 @@ from mailman.interfaces.handler import IHandler
 from mailman.interfaces.pipeline import (
     DiscardMessage, IPipeline, RejectMessage)
 from mailman.utilities.modules import find_components
+from public import public
 from zope.interface import implementer
 from zope.interface.verify import verifyObject
 
diff --git a/src/mailman/core/rules.py b/src/mailman/core/rules.py
index f6ca87726..680d4f007 100644
--- a/src/mailman/core/rules.py
+++ b/src/mailman/core/rules.py
@@ -17,10 +17,10 @@
 
 """Various rule helpers"""
 
-from mailman import public
 from mailman.config import config
 from mailman.interfaces.rules import IRule
 from mailman.utilities.modules import find_components
+from public import public
 from zope.interface.verify import verifyObject
 
 
diff --git a/src/mailman/core/runner.py b/src/mailman/core/runner.py
index d0ff6f5ce..ed1c26d38 100644
--- a/src/mailman/core/runner.py
+++ b/src/mailman/core/runner.py
@@ -25,7 +25,6 @@ import traceback
 from contextlib import suppress
 from io import StringIO
 from lazr.config import as_boolean, as_timedelta
-from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.core.logging import reopen
@@ -34,6 +33,7 @@ from mailman.interfaces.languages import ILanguageManager
 from mailman.interfaces.listmanager import IListManager
 from mailman.interfaces.runner import IRunner, RunnerCrashEvent
 from mailman.utilities.string import expand
+from public import public
 from zope.component import getUtility
 from zope.event import notify
 from zope.interface import implementer
diff --git a/src/mailman/core/switchboard.py b/src/mailman/core/switchboard.py
index cfbb371ba..f03ee11e5 100644
--- a/src/mailman/core/switchboard.py
+++ b/src/mailman/core/switchboard.py
@@ -31,13 +31,13 @@ import pickle
 import hashlib
 import logging
 
-from mailman import public
 from mailman.config import config
 from mailman.email.message import Message
 from mailman.interfaces.configuration import ConfigurationUpdatedEvent
 from mailman.interfaces.switchboard import ISwitchboard
 from mailman.utilities.filesystem import makedirs
 from mailman.utilities.string import expand
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/core/system.py b/src/mailman/core/system.py
index ee88c5adf..2d76f0c97 100644
--- a/src/mailman/core/system.py
+++ b/src/mailman/core/system.py
@@ -19,8 +19,8 @@
 
 import sys
 
-from mailman import public, version
 from mailman.interfaces.system import ISystem
+from public import public, version
 from zope.interface import implementer