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

13 files changed, 13 insertions, 13 deletions

diff --git a/src/mailman/app/bounces.py b/src/mailman/app/bounces.py
index 98076dc9b..7fcbe4c2a 100644
--- a/src/mailman/app/bounces.py
+++ b/src/mailman/app/bounces.py
@@ -24,7 +24,6 @@ import logging
 from email.mime.message import MIMEMessage
 from email.mime.text import MIMEText
 from email.utils import parseaddr
-from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.email.message import OwnerNotification, UserNotification
@@ -35,6 +34,7 @@ from mailman.interfaces.subscriptions import ISubscriptionService
 from mailman.interfaces.template import ITemplateLoader
 from mailman.utilities.email import split_email
 from mailman.utilities.string import expand, oneline, wrap
+from public import public
 from string import Template
 from zope.component import getUtility
 from zope.interface import implementer
diff --git a/src/mailman/app/commands.py b/src/mailman/app/commands.py
index 4c484bc0b..093156d78 100644
--- a/src/mailman/app/commands.py
+++ b/src/mailman/app/commands.py
@@ -17,10 +17,10 @@
 
 """Initialize the email commands."""
 
-from mailman import public
 from mailman.config import config
 from mailman.interfaces.command import IEmailCommand
 from mailman.utilities.modules import find_components
+from public import public
 from zope.interface.verify import verifyObject
 
 
diff --git a/src/mailman/app/digests.py b/src/mailman/app/digests.py
index 0d47df328..409c22125 100644
--- a/src/mailman/app/digests.py
+++ b/src/mailman/app/digests.py
@@ -19,11 +19,11 @@
 
 import os
 
-from mailman import public
 from mailman.config import config
 from mailman.email.message import Message
 from mailman.interfaces.digests import DigestFrequency
 from mailman.utilities.datetime import now as right_now
+from public import public
 
 
 @public
diff --git a/src/mailman/app/domain.py b/src/mailman/app/domain.py
index 66abf9c3e..33546d34a 100644
--- a/src/mailman/app/domain.py
+++ b/src/mailman/app/domain.py
@@ -17,9 +17,9 @@
 
 """Application level domain support."""
 
-from mailman import public
 from mailman.interfaces.domain import DomainDeletingEvent
 from mailman.interfaces.listmanager import IListManager
+from public import public
 from zope.component import getUtility
 
 
diff --git a/src/mailman/app/events.py b/src/mailman/app/events.py
index f3323b6ce..c7d4857cb 100644
--- a/src/mailman/app/events.py
+++ b/src/mailman/app/events.py
@@ -17,12 +17,12 @@
 
 """Global events."""
 
-from mailman import public
 from mailman.app import domain, membership, moderator, subscriptions
 from mailman.core import i18n, switchboard
 from mailman.languages import manager as language_manager
 from mailman.styles import manager as style_manager
 from mailman.utilities import passwords
+from public import public
 from zope import event
 
 
diff --git a/src/mailman/app/inject.py b/src/mailman/app/inject.py
index decc0fd0e..ca03942ea 100644
--- a/src/mailman/app/inject.py
+++ b/src/mailman/app/inject.py
@@ -19,10 +19,10 @@
 
 from email import message_from_string
 from email.utils import formatdate, make_msgid
-from mailman import public
 from mailman.config import config
 from mailman.email.message import Message
 from mailman.utilities.email import add_message_hash
+from public import public
 
 
 @public
diff --git a/src/mailman/app/lifecycle.py b/src/mailman/app/lifecycle.py
index 50145ce8f..ccd3e4b35 100644
--- a/src/mailman/app/lifecycle.py
+++ b/src/mailman/app/lifecycle.py
@@ -21,7 +21,6 @@ import shutil
 import logging
 
 from contextlib import suppress
-from mailman import public
 from mailman.config import config
 from mailman.interfaces.address import IEmailValidator
 from mailman.interfaces.domain import (
@@ -31,6 +30,7 @@ from mailman.interfaces.member import MemberRole
 from mailman.interfaces.styles import IStyleManager
 from mailman.interfaces.usermanager import IUserManager
 from mailman.utilities.modules import call_name
+from public import public
 from zope.component import getUtility
 
 
diff --git a/src/mailman/app/membership.py b/src/mailman/app/membership.py
index 534eed15d..5eb15cf30 100644
--- a/src/mailman/app/membership.py
+++ b/src/mailman/app/membership.py
@@ -18,7 +18,6 @@
 """Application support for membership management."""
 
 from email.utils import formataddr
-from mailman import public
 from mailman.app.notifications import (
     send_admin_subscription_notice, send_goodbye_message,
     send_welcome_message)
@@ -33,6 +32,7 @@ from mailman.interfaces.template import ITemplateLoader
 from mailman.interfaces.user import IUser
 from mailman.interfaces.usermanager import IUserManager
 from mailman.utilities.string import expand
+from public import public
 from zope.component import getUtility
 
 
diff --git a/src/mailman/app/moderator.py b/src/mailman/app/moderator.py
index 9d3856f33..fe7a81383 100644
--- a/src/mailman/app/moderator.py
+++ b/src/mailman/app/moderator.py
@@ -21,7 +21,6 @@ import time
 import logging
 
 from email.utils import formatdate, getaddresses, make_msgid
-from mailman import public
 from mailman.app.membership import delete_member
 from mailman.config import config
 from mailman.core.i18n import _
@@ -34,6 +33,7 @@ from mailman.interfaces.requests import IListRequests, RequestType
 from mailman.interfaces.template import ITemplateLoader
 from mailman.utilities.datetime import now
 from mailman.utilities.string import expand, wrap
+from public import public
 from zope.component import getUtility
 
 
diff --git a/src/mailman/app/notifications.py b/src/mailman/app/notifications.py
index 31a15d820..4d5c1be12 100644
--- a/src/mailman/app/notifications.py
+++ b/src/mailman/app/notifications.py
@@ -21,13 +21,13 @@ import logging
 
 from email.utils import formataddr
 from lazr.config import as_boolean
-from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.email.message import OwnerNotification, UserNotification
 from mailman.interfaces.member import DeliveryMode
 from mailman.interfaces.template import ITemplateLoader
 from mailman.utilities.string import expand, wrap
+from public import public
 from zope.component import getUtility
 
 
diff --git a/src/mailman/app/replybot.py b/src/mailman/app/replybot.py
index fc911c5a1..f707fec89 100644
--- a/src/mailman/app/replybot.py
+++ b/src/mailman/app/replybot.py
@@ -17,7 +17,7 @@
 
 """Application level auto-reply code."""
 
-from mailman import public
+from public import public
 
 
 @public
diff --git a/src/mailman/app/subscriptions.py b/src/mailman/app/subscriptions.py
index f88a967c2..a38b3061d 100644
--- a/src/mailman/app/subscriptions.py
+++ b/src/mailman/app/subscriptions.py
@@ -23,7 +23,6 @@ import logging
 from datetime import timedelta
 from email.utils import formataddr
 from enum import Enum
-from mailman import public
 from mailman.app.membership import delete_member
 from mailman.app.workflow import Workflow
 from mailman.core.i18n import _
@@ -45,6 +44,7 @@ from mailman.interfaces.usermanager import IUserManager
 from mailman.interfaces.workflow import IWorkflowStateManager
 from mailman.utilities.datetime import now
 from mailman.utilities.string import expand, 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/app/workflow.py b/src/mailman/app/workflow.py
index cd9124993..e11ae03cf 100644
--- a/src/mailman/app/workflow.py
+++ b/src/mailman/app/workflow.py
@@ -22,8 +22,8 @@ import json
 import logging
 
 from collections import deque
-from mailman import public
 from mailman.interfaces.workflow import IWorkflowStateManager
+from public import public
 from zope.component import getUtility