Merged from master.

12 files changed, 15 insertions, 18 deletions

diff --git a/src/mailman/runners/archive.py b/src/mailman/runners/archive.py
index 23b7b164d..073f72d52 100644
--- a/src/mailman/runners/archive.py
+++ b/src/mailman/runners/archive.py
@@ -23,12 +23,12 @@ import logging
 from datetime import datetime
 from email.utils import mktime_tz, parsedate_tz
 from lazr.config import as_timedelta
-from mailman import public
 from mailman.config import config
 from mailman.core.runner import Runner
 from mailman.interfaces.archiver import ClobberDate
 from mailman.interfaces.mailinglist import IListArchiverSet
 from mailman.utilities.datetime import RFC822_DATE_FMT, now
+from public import public
 
 
 log = logging.getLogger('mailman.archiver')
diff --git a/src/mailman/runners/bounce.py b/src/mailman/runners/bounce.py
index 4150dc9b5..40ea840e7 100644
--- a/src/mailman/runners/bounce.py
+++ b/src/mailman/runners/bounce.py
@@ -20,10 +20,10 @@
 import logging
 
 from flufl.bounce import all_failures, scan_message
-from mailman import public
 from mailman.app.bounces import ProbeVERP, StandardVERP, maybe_forward
 from mailman.core.runner import Runner
 from mailman.interfaces.bounce import BounceContext, IBounceProcessor
+from public import public
 from zope.component import getUtility
 
 
diff --git a/src/mailman/runners/command.py b/src/mailman/runners/command.py
index ba10988e3..a52dd541d 100644
--- a/src/mailman/runners/command.py
+++ b/src/mailman/runners/command.py
@@ -30,13 +30,13 @@ from email.errors import HeaderParseError
 from email.header import decode_header, make_header
 from email.iterators import typed_subpart_iterator
 from io import StringIO
-from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.core.runner import Runner
 from mailman.email.message import UserNotification
 from mailman.interfaces.command import ContinueProcessing, IEmailResults
 from mailman.interfaces.languages import ILanguageManager
+from public import public
 from zope.component import getUtility
 from zope.interface import implementer
 
diff --git a/src/mailman/runners/digest.py b/src/mailman/runners/digest.py
index 4971965fa..284056e3a 100644
--- a/src/mailman/runners/digest.py
+++ b/src/mailman/runners/digest.py
@@ -27,7 +27,6 @@ from email.mime.message import MIMEMessage
 from email.mime.text import MIMEText
 from email.utils import formatdate, getaddresses, make_msgid
 from io import StringIO
-from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.core.runner import Runner
@@ -37,6 +36,7 @@ from mailman.interfaces.member import DeliveryMode, DeliveryStatus
 from mailman.interfaces.template import ITemplateLoader
 from mailman.utilities.mailbox import Mailbox
 from mailman.utilities.string import expand, oneline, wrap
+from public import public
 from zope.component import getUtility
 
 
diff --git a/src/mailman/runners/incoming.py b/src/mailman/runners/incoming.py
index 62b12dab1..9461e59bc 100644
--- a/src/mailman/runners/incoming.py
+++ b/src/mailman/runners/incoming.py
@@ -27,12 +27,12 @@ immediately.
 """
 
 from contextlib import suppress
-from mailman import public
 from mailman.core.chains import process
 from mailman.core.runner import Runner
 from mailman.database.transaction import transaction
 from mailman.interfaces.address import ExistingAddressError
 from mailman.interfaces.usermanager import IUserManager
+from public import public
 from zope.component import getUtility
 
 
diff --git a/src/mailman/runners/lmtp.py b/src/mailman/runners/lmtp.py
index 21fb44c5e..25d531da4 100644
--- a/src/mailman/runners/lmtp.py
+++ b/src/mailman/runners/lmtp.py
@@ -37,13 +37,10 @@ so that the peer mail server can provide better diagnostics.
 import email
 import socket
 import logging
-import aiosmtpd
-import aiosmtpd.smtp
 
 from aiosmtpd.controller import Controller
 from aiosmtpd.lmtp import LMTP
 from email.utils import parseaddr
-from mailman import public
 from mailman.config import config
 from mailman.core.runner import Runner
 from mailman.database.transaction import transactional
@@ -51,6 +48,7 @@ from mailman.email.message import Message
 from mailman.interfaces.listmanager import IListManager
 from mailman.utilities.datetime import now
 from mailman.utilities.email import add_message_hash
+from public import public
 from zope.component import getUtility
 
 
@@ -93,9 +91,6 @@ ERR_502 = '502 Error: command HELO not implemented'
 ERR_550 = '550 Requested action not taken: mailbox unavailable'
 ERR_550_MID = '550 No Message-ID header provided'
 
-# XXX Blech
-aiosmtpd.smtp.__version__ = 'GNU Mailman LMTP runner 2.0'
-
 
 def split_recipient(address):
     """Split an address into listname, subaddress and domain parts.
@@ -218,7 +213,9 @@ class LMTPHandler:
 
 class LMTPController(Controller):
     def factory(self):
-        return LMTP(self.handler)
+        server = LMTP(self.handler)
+        server.__ident__ = 'GNU Mailman LMTP runner 2.0'
+        return server
 
     def make_socket(self):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
diff --git a/src/mailman/runners/nntp.py b/src/mailman/runners/nntp.py
index b125fe4f9..38f67c453 100644
--- a/src/mailman/runners/nntp.py
+++ b/src/mailman/runners/nntp.py
@@ -24,10 +24,10 @@ import logging
 import nntplib
 
 from io import StringIO
-from mailman import public
 from mailman.config import config
 from mailman.core.runner import Runner
 from mailman.interfaces.nntp import NewsgroupModeration
+from public import public
 
 
 COMMA = ','
diff --git a/src/mailman/runners/outgoing.py b/src/mailman/runners/outgoing.py
index 3f21e3813..61b6e0b99 100644
--- a/src/mailman/runners/outgoing.py
+++ b/src/mailman/runners/outgoing.py
@@ -22,7 +22,6 @@ import logging
 
 from datetime import datetime
 from lazr.config import as_boolean, as_timedelta
-from mailman import public
 from mailman.config import config
 from mailman.core.runner import Runner
 from mailman.interfaces.bounce import BounceContext, IBounceProcessor
@@ -32,6 +31,7 @@ from mailman.interfaces.pending import IPendings
 from mailman.interfaces.subscriptions import ISubscriptionService
 from mailman.utilities.datetime import now
 from mailman.utilities.modules import find_name
+from public import public
 from uuid import UUID
 from zope.component import getUtility
 
diff --git a/src/mailman/runners/pipeline.py b/src/mailman/runners/pipeline.py
index 3ec7499f2..caa68763c 100644
--- a/src/mailman/runners/pipeline.py
+++ b/src/mailman/runners/pipeline.py
@@ -22,9 +22,9 @@ through the 'preparation pipeline'.  This pipeline adds, deletes and modifies
 headers, calculates message recipients, and more.
 """
 
-from mailman import public
 from mailman.core.pipelines import process
 from mailman.core.runner import Runner
+from public import public
 
 
 @public
diff --git a/src/mailman/runners/rest.py b/src/mailman/runners/rest.py
index 037b6adf8..dd7eae245 100644
--- a/src/mailman/runners/rest.py
+++ b/src/mailman/runners/rest.py
@@ -21,9 +21,9 @@ import signal
 import logging
 import threading
 
-from mailman import public
 from mailman.core.runner import Runner
 from mailman.rest.wsgiapp import make_server
+from public import public
 
 
 log = logging.getLogger('mailman.http')
diff --git a/src/mailman/runners/retry.py b/src/mailman/runners/retry.py
index f1af4f73c..2be89e8b0 100644
--- a/src/mailman/runners/retry.py
+++ b/src/mailman/runners/retry.py
@@ -19,9 +19,9 @@
 
 import time
 
-from mailman import public
 from mailman.config import config
 from mailman.core.runner import Runner
+from public import public
 
 
 @public
diff --git a/src/mailman/runners/virgin.py b/src/mailman/runners/virgin.py
index a69d07bf7..50ef3dcce 100644
--- a/src/mailman/runners/virgin.py
+++ b/src/mailman/runners/virgin.py
@@ -23,9 +23,9 @@ to go through some minimal processing before they can be sent out to the
 recipient.
 """
 
-from mailman import public
 from mailman.core.pipelines import process
 from mailman.core.runner import Runner
+from public import public
 
 
 @public