Merged from master.

24 files changed, 24 insertions, 24 deletions

diff --git a/src/mailman/model/address.py b/src/mailman/model/address.py
index a31e9a429..63896c728 100644
--- a/src/mailman/model/address.py
+++ b/src/mailman/model/address.py
@@ -18,12 +18,12 @@
 """Model for addresses."""
 
 from email.utils import formataddr
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.types import SAUnicode
 from mailman.interfaces.address import (
     AddressVerificationEvent, IAddress, IEmailValidator)
 from mailman.utilities.datetime import now
+from public import public
 from sqlalchemy import Column, DateTime, ForeignKey, Integer
 from sqlalchemy.orm import backref, relationship
 from zope.component import getUtility
diff --git a/src/mailman/model/autorespond.py b/src/mailman/model/autorespond.py
index 20c19889f..e9509c4f8 100644
--- a/src/mailman/model/autorespond.py
+++ b/src/mailman/model/autorespond.py
@@ -17,13 +17,13 @@
 
 """Autoresponder records."""
 
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
 from mailman.database.types import Enum
 from mailman.interfaces.autorespond import (
     IAutoResponseRecord, IAutoResponseSet, Response)
 from mailman.utilities.datetime import today
+from public import public
 from sqlalchemy import Column, Date, ForeignKey, Integer, desc
 from sqlalchemy.orm import relationship
 from zope.interface import implementer
diff --git a/src/mailman/model/bans.py b/src/mailman/model/bans.py
index c8d43c5ae..1c4cbde8c 100644
--- a/src/mailman/model/bans.py
+++ b/src/mailman/model/bans.py
@@ -19,12 +19,12 @@
 
 import re
 
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
 from mailman.database.types import SAUnicode
 from mailman.interfaces.bans import IBan, IBanManager
 from mailman.utilities.queries import QuerySequence
+from public import public
 from sqlalchemy import Column, Integer
 from zope.interface import implementer
 
diff --git a/src/mailman/model/bounce.py b/src/mailman/model/bounce.py
index 856d91f20..6db55a3c7 100644
--- a/src/mailman/model/bounce.py
+++ b/src/mailman/model/bounce.py
@@ -17,13 +17,13 @@
 
 """Bounce support."""
 
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
 from mailman.database.types import Enum, SAUnicode
 from mailman.interfaces.bounce import (
     BounceContext, IBounceEvent, IBounceProcessor)
 from mailman.utilities.datetime import now
+from public import public
 from sqlalchemy import Boolean, Column, DateTime, Integer
 from zope.interface import implementer
 
diff --git a/src/mailman/model/cache.py b/src/mailman/model/cache.py
index 6be5fbc9d..d1ef9f05c 100644
--- a/src/mailman/model/cache.py
+++ b/src/mailman/model/cache.py
@@ -22,13 +22,13 @@ import hashlib
 
 from contextlib import ExitStack
 from lazr.config import as_timedelta
-from mailman import public
 from mailman.config import config
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
 from mailman.database.types import SAUnicode
 from mailman.interfaces.cache import ICacheManager
 from mailman.utilities.datetime import now
+from public import public
 from sqlalchemy import Boolean, Column, DateTime, Integer
 from zope.interface import implementer
 
diff --git a/src/mailman/model/digests.py b/src/mailman/model/digests.py
index ac49249cc..a0daaebbc 100644
--- a/src/mailman/model/digests.py
+++ b/src/mailman/model/digests.py
@@ -17,11 +17,11 @@
 
 """One last digest."""
 
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.types import Enum
 from mailman.interfaces.digests import IOneLastDigest
 from mailman.interfaces.member import DeliveryMode
+from public import public
 from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.orm import relationship
 from zope.interface import implementer
diff --git a/src/mailman/model/domain.py b/src/mailman/model/domain.py
index 5bb569585..2622ba80b 100644
--- a/src/mailman/model/domain.py
+++ b/src/mailman/model/domain.py
@@ -17,7 +17,6 @@
 
 """Domains."""
 
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
 from mailman.database.types import SAUnicode
@@ -27,6 +26,7 @@ from mailman.interfaces.domain import (
 from mailman.interfaces.user import IUser
 from mailman.interfaces.usermanager import IUserManager
 from mailman.model.mailinglist import MailingList
+from public import public
 from sqlalchemy import Column, Integer
 from sqlalchemy.orm import relationship
 from zope.component import getUtility
diff --git a/src/mailman/model/language.py b/src/mailman/model/language.py
index 596e580e1..c762b9715 100644
--- a/src/mailman/model/language.py
+++ b/src/mailman/model/language.py
@@ -17,10 +17,10 @@
 
 """Model for languages."""
 
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.types import SAUnicode
 from mailman.interfaces.languages import ILanguage
+from public import public
 from sqlalchemy import Column, Integer
 from zope.interface import implementer
 
diff --git a/src/mailman/model/listmanager.py b/src/mailman/model/listmanager.py
index e2519af5b..bd07e6c27 100644
--- a/src/mailman/model/listmanager.py
+++ b/src/mailman/model/listmanager.py
@@ -17,7 +17,6 @@
 
 """A mailing list manager."""
 
-from mailman import public
 from mailman.database.transaction import dbconnection
 from mailman.interfaces.address import InvalidEmailAddressError
 from mailman.interfaces.listmanager import (
@@ -30,6 +29,7 @@ from mailman.model.mailinglist import (
 from mailman.model.mime import ContentFilter
 from mailman.utilities.datetime import now
 from mailman.utilities.queries import QuerySequence
+from public import public
 from zope.event import notify
 from zope.interface import implementer
 
diff --git a/src/mailman/model/mailinglist.py b/src/mailman/model/mailinglist.py
index 1a97d6506..51d322dbc 100644
--- a/src/mailman/model/mailinglist.py
+++ b/src/mailman/model/mailinglist.py
@@ -19,7 +19,6 @@
 
 import os
 
-from mailman import public
 from mailman.config import config
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
@@ -49,6 +48,7 @@ from mailman.model.mime import ContentFilter
 from mailman.model.preferences import Preferences
 from mailman.utilities.filesystem import makedirs
 from mailman.utilities.string import expand
+from public import public
 from sqlalchemy import (
     Boolean, Column, DateTime, Float, ForeignKey, Integer, Interval,
     LargeBinary, PickleType)
diff --git a/src/mailman/model/member.py b/src/mailman/model/member.py
index aacaa73b6..93d0c7feb 100644
--- a/src/mailman/model/member.py
+++ b/src/mailman/model/member.py
@@ -17,7 +17,6 @@
 
 """Model for members."""
 
-from mailman import public
 from mailman.core.constants import system_preferences
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
@@ -30,6 +29,7 @@ from mailman.interfaces.member import (
 from mailman.interfaces.user import IUser, UnverifiedAddressError
 from mailman.interfaces.usermanager import IUserManager
 from mailman.utilities.uid import UIDFactory
+from public import public
 from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.orm import relationship
 from zope.component import getUtility
diff --git a/src/mailman/model/message.py b/src/mailman/model/message.py
index 576baab5c..233e8b5b5 100644
--- a/src/mailman/model/message.py
+++ b/src/mailman/model/message.py
@@ -17,11 +17,11 @@
 
 """Model for messages."""
 
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
 from mailman.database.types import SAUnicode
 from mailman.interfaces.messages import IMessage
+from public import public
 from sqlalchemy import Column, Integer
 from zope.interface import implementer
 
diff --git a/src/mailman/model/messagestore.py b/src/mailman/model/messagestore.py
index 8949c56c6..dc037c44f 100644
--- a/src/mailman/model/messagestore.py
+++ b/src/mailman/model/messagestore.py
@@ -21,13 +21,13 @@ import os
 import errno
 import pickle
 
-from mailman import public
 from mailman.config import config
 from mailman.database.transaction import dbconnection
 from mailman.interfaces.messages import IMessageStore
 from mailman.model.message import Message
 from mailman.utilities.email import add_message_hash
 from mailman.utilities.filesystem import makedirs, safe_remove
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/model/mime.py b/src/mailman/model/mime.py
index da5f11f05..a21cfb35d 100644
--- a/src/mailman/model/mime.py
+++ b/src/mailman/model/mime.py
@@ -17,10 +17,10 @@
 
 """The content filter."""
 
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.types import Enum, SAUnicode
 from mailman.interfaces.mime import FilterType, IContentFilter
+from public import public
 from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.orm import relationship
 from zope.interface import implementer
diff --git a/src/mailman/model/pending.py b/src/mailman/model/pending.py
index 3df28af06..60be56e8f 100644
--- a/src/mailman/model/pending.py
+++ b/src/mailman/model/pending.py
@@ -20,7 +20,6 @@
 import json
 
 from lazr.config import as_timedelta
-from mailman import public
 from mailman.config import config
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
@@ -29,6 +28,7 @@ from mailman.interfaces.pending import (
     IPendable, IPended, IPendedKeyValue, IPendings)
 from mailman.utilities.datetime import now
 from mailman.utilities.uid import TokenFactory
+from public import public
 from sqlalchemy import Column, DateTime, ForeignKey, Integer, and_
 from sqlalchemy.orm import aliased, relationship
 from zope.interface import implementer
diff --git a/src/mailman/model/preferences.py b/src/mailman/model/preferences.py
index 366ed97c2..4e57ce659 100644
--- a/src/mailman/model/preferences.py
+++ b/src/mailman/model/preferences.py
@@ -17,13 +17,13 @@
 
 """Model for preferences."""
 
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
 from mailman.database.types import Enum, SAUnicode
 from mailman.interfaces.languages import ILanguageManager
 from mailman.interfaces.member import DeliveryMode, DeliveryStatus
 from mailman.interfaces.preferences import IPreferences
+from public import public
 from sqlalchemy import Boolean, Column, Integer
 from zope.component import getUtility
 from zope.interface import implementer
diff --git a/src/mailman/model/requests.py b/src/mailman/model/requests.py
index 0f0f96dfe..04717f49a 100644
--- a/src/mailman/model/requests.py
+++ b/src/mailman/model/requests.py
@@ -18,7 +18,6 @@
 """Implementations of the pending requests interfaces."""
 
 from datetime import timedelta
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
 from mailman.database.types import Enum, SAUnicode
@@ -26,6 +25,7 @@ from mailman.interfaces.pending import IPendable, IPendings
 from mailman.interfaces.requests import IListRequests, RequestType
 from mailman.utilities.queries import QuerySequence
 from pickle import dumps, loads
+from public import public
 from sqlalchemy import Column, ForeignKey, Integer
 from sqlalchemy.orm import relationship
 from zope.component import getUtility
diff --git a/src/mailman/model/roster.py b/src/mailman/model/roster.py
index 5dc0423b2..d3dc1b661 100644
--- a/src/mailman/model/roster.py
+++ b/src/mailman/model/roster.py
@@ -22,12 +22,12 @@ the ones that fit a particular role.  These are used as the member, owner,
 moderator, and administrator roster filters.
 """
 
-from mailman import public
 from mailman.database.transaction import dbconnection
 from mailman.interfaces.member import DeliveryMode, MemberRole
 from mailman.interfaces.roster import IRoster
 from mailman.model.address import Address
 from mailman.model.member import Member
+from public import public
 from sqlalchemy import or_
 from zope.interface import implementer
 
diff --git a/src/mailman/model/subscriptions.py b/src/mailman/model/subscriptions.py
index d3fdc3a8a..485524a68 100644
--- a/src/mailman/model/subscriptions.py
+++ b/src/mailman/model/subscriptions.py
@@ -17,7 +17,6 @@
 
 """Subscription services."""
 
-from mailman import public
 from mailman.app.membership import delete_member
 from mailman.database.transaction import dbconnection
 from mailman.interfaces.listmanager import IListManager, NoSuchListError
@@ -30,6 +29,7 @@ from mailman.model.member import Member
 from mailman.model.user import User
 from mailman.utilities.queries import QuerySequence
 from operator import attrgetter
+from public import public
 from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
 from zope.component import getUtility
 from zope.interface import implementer
diff --git a/src/mailman/model/template.py b/src/mailman/model/template.py
index b09c644bb..eb776293f 100644
--- a/src/mailman/model/template.py
+++ b/src/mailman/model/template.py
@@ -19,7 +19,6 @@
 
 import logging
 
-from mailman import public
 from mailman.config import config
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
@@ -32,6 +31,7 @@ from mailman.interfaces.template import (
 from mailman.utilities import protocols
 from mailman.utilities.i18n import find
 from mailman.utilities.string import expand
+from public import public
 from requests import HTTPError
 from sqlalchemy import Column, Integer
 from urllib.error import URLError
diff --git a/src/mailman/model/uid.py b/src/mailman/model/uid.py
index 2cf61668f..9daefa318 100644
--- a/src/mailman/model/uid.py
+++ b/src/mailman/model/uid.py
@@ -17,10 +17,10 @@
 
 """Unique IDs."""
 
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
 from mailman.database.types import UUID
+from public import public
 from sqlalchemy import Column, Integer
 
 
diff --git a/src/mailman/model/user.py b/src/mailman/model/user.py
index edda2a9e8..dc9c097d5 100644
--- a/src/mailman/model/user.py
+++ b/src/mailman/model/user.py
@@ -17,7 +17,6 @@
 
 """Model for users."""
 
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
 from mailman.database.types import SAUnicode, UUID
@@ -31,6 +30,7 @@ from mailman.model.preferences import Preferences
 from mailman.model.roster import Memberships
 from mailman.utilities.datetime import factory as date_factory
 from mailman.utilities.uid import UIDFactory
+from public import public
 from sqlalchemy import (
     Boolean, Column, DateTime, ForeignKey, Integer)
 from sqlalchemy.orm import backref, relationship
diff --git a/src/mailman/model/usermanager.py b/src/mailman/model/usermanager.py
index fba8e2ec0..2a62e0cf1 100644
--- a/src/mailman/model/usermanager.py
+++ b/src/mailman/model/usermanager.py
@@ -17,7 +17,6 @@
 
 """A user manager."""
 
-from mailman import public
 from mailman.database.transaction import dbconnection
 from mailman.interfaces.address import ExistingAddressError
 from mailman.interfaces.usermanager import IUserManager
@@ -27,6 +26,7 @@ from mailman.model.digests import OneLastDigest
 from mailman.model.member import Member
 from mailman.model.preferences import Preferences
 from mailman.model.user import User
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/model/workflow.py b/src/mailman/model/workflow.py
index 53763a0e8..8b782b5e0 100644
--- a/src/mailman/model/workflow.py
+++ b/src/mailman/model/workflow.py
@@ -17,11 +17,11 @@
 
 """Model for workflow states."""
 
-from mailman import public
 from mailman.database.model import Model
 from mailman.database.transaction import dbconnection
 from mailman.database.types import SAUnicode
 from mailman.interfaces.workflow import IWorkflowState, IWorkflowStateManager
+from public import public
 from sqlalchemy import Column
 from zope.interface import implementer