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

6 files changed, 6 insertions, 6 deletions

diff --git a/src/mailman/testing/documentation.py b/src/mailman/testing/documentation.py
index 29629fe1b..97e30e900 100644
--- a/src/mailman/testing/documentation.py
+++ b/src/mailman/testing/documentation.py
@@ -22,12 +22,12 @@ distributions.  doctest discovery currently requires file system traversal.
 """
 
 from inspect import isfunction, ismethod
-from mailman import public
 from mailman.app.lifecycle import create_list
 from mailman.config import config
 from mailman.testing.helpers import (
     call_api, get_queue_messages, specialized_message_from_string, subscribe)
 from mailman.testing.layers import SMTPLayer
+from public import public
 
 
 DOT = '.'
diff --git a/src/mailman/testing/helpers.py b/src/mailman/testing/helpers.py
index 2ce6956b7..01b362192 100644
--- a/src/mailman/testing/helpers.py
+++ b/src/mailman/testing/helpers.py
@@ -35,7 +35,6 @@ from contextlib import contextmanager, suppress
 from email import message_from_string
 from httplib2 import Http
 from lazr.config import as_timedelta
-from mailman import public
 from mailman.bin.master import Loop as Master
 from mailman.config import config
 from mailman.database.transaction import transaction
@@ -46,6 +45,7 @@ from mailman.interfaces.styles import IStyleManager
 from mailman.interfaces.usermanager import IUserManager
 from mailman.runners.digest import DigestRunner
 from mailman.utilities.mailbox import Mailbox
+from public import public
 from unittest import mock
 from urllib.error import HTTPError
 from urllib.parse import urlencode
diff --git a/src/mailman/testing/i18n.py b/src/mailman/testing/i18n.py
index 2031be307..ade8584b1 100644
--- a/src/mailman/testing/i18n.py
+++ b/src/mailman/testing/i18n.py
@@ -20,8 +20,8 @@
 from contextlib import closing
 from flufl.i18n import registry
 from gettext import GNUTranslations, NullTranslations
-from mailman import public
 from pkg_resources import resource_stream
+from public import public
 
 
 class TestingStrategy:
diff --git a/src/mailman/testing/layers.py b/src/mailman/testing/layers.py
index 3157809e6..67fb4f5e1 100644
--- a/src/mailman/testing/layers.py
+++ b/src/mailman/testing/layers.py
@@ -32,7 +32,6 @@ import datetime
 import tempfile
 
 from lazr.config import as_boolean
-from mailman import public
 from mailman.config import config
 from mailman.core import initialize
 from mailman.core.initialize import INHIBIT_CONFIG_FILE
@@ -44,6 +43,7 @@ from mailman.testing.helpers import (
 from mailman.testing.mta import ConnectionCountingController
 from mailman.utilities.string import expand
 from pkg_resources import resource_string as resource_bytes
+from public import public
 from textwrap import dedent
 from zope.component import getUtility
 
diff --git a/src/mailman/testing/mta.py b/src/mailman/testing/mta.py
index 81e4b8a62..d94466428 100644
--- a/src/mailman/testing/mta.py
+++ b/src/mailman/testing/mta.py
@@ -24,8 +24,8 @@ import smtplib
 from aiosmtpd.controller import Controller
 from aiosmtpd.handlers import Message as MessageHandler
 from aiosmtpd.smtp import SMTP
-from mailman import public
 from mailman.interfaces.mta import IMailTransportAgentLifecycle
+from public import public
 from queue import Empty, Queue
 from zope.interface import implementer
 
diff --git a/src/mailman/testing/nose.py b/src/mailman/testing/nose.py
index bbd361390..1a9830da5 100644
--- a/src/mailman/testing/nose.py
+++ b/src/mailman/testing/nose.py
@@ -22,11 +22,11 @@ import re
 import doctest
 import importlib
 
-from mailman import public
 from mailman.testing.documentation import setup, teardown
 from mailman.testing.layers import ConfigLayer, MockAndMonkeyLayer, SMTPLayer
 from nose2.events import Plugin
 from pkg_resources import resource_filename
+from public import public
 
 
 DOT = '.'