19 files changed, 20 insertions, 20 deletions
diff --git a/src/mailman/handlers/acknowledge.py b/src/mailman/handlers/acknowledge.py
index c7035de67..56608a3e9 100644
--- a/src/mailman/handlers/acknowledge.py
+++ b/src/mailman/handlers/acknowledge.py
@@ -20,13 +20,13 @@
 This only happens if the sender has set their AcknowledgePosts attribute.
 """
 
-from mailman import public
 from mailman.core.i18n import _
 from mailman.email.message import UserNotification
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.languages import ILanguageManager
 from mailman.interfaces.template import ITemplateLoader
 from mailman.utilities.string import expand, oneline
+from public import public
 from zope.component import getUtility
 from zope.interface import implementer
 
diff --git a/src/mailman/handlers/after_delivery.py b/src/mailman/handlers/after_delivery.py
index efe38ec63..928f90f76 100644
--- a/src/mailman/handlers/after_delivery.py
+++ b/src/mailman/handlers/after_delivery.py
@@ -17,10 +17,10 @@
 
 """Perform some bookkeeping after a successful post."""
 
-from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
 from mailman.utilities.datetime import now
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/avoid_duplicates.py b/src/mailman/handlers/avoid_duplicates.py
index 59cb568de..7fe2136da 100644
--- a/src/mailman/handlers/avoid_duplicates.py
+++ b/src/mailman/handlers/avoid_duplicates.py
@@ -24,9 +24,9 @@ warning header, or pass it through, depending on the user's preferences.
 """
 
 from email.utils import getaddresses, formataddr
-from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/cleanse.py b/src/mailman/handlers/cleanse.py
index 56add9ef7..8704491f6 100644
--- a/src/mailman/handlers/cleanse.py
+++ b/src/mailman/handlers/cleanse.py
@@ -20,10 +20,10 @@
 import logging
 
 from email.utils import formataddr
-from mailman import public
 from mailman.core.i18n import _
 from mailman.handlers.cook_headers import uheader
 from mailman.interfaces.handler import IHandler
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/cleanse_dkim.py b/src/mailman/handlers/cleanse_dkim.py
index 72a9c5e81..cc04858be 100644
--- a/src/mailman/handlers/cleanse_dkim.py
+++ b/src/mailman/handlers/cleanse_dkim.py
@@ -26,10 +26,10 @@ originating at the Mailman server for the outgoing message.
 """
 
 from lazr.config import as_boolean
-from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/cook_headers.py b/src/mailman/handlers/cook_headers.py
index 5f203fcbd..672738bf9 100644
--- a/src/mailman/handlers/cook_headers.py
+++ b/src/mailman/handlers/cook_headers.py
@@ -22,11 +22,11 @@ import logging
 
 from email.header import Header
 from email.utils import formataddr, getaddresses, parseaddr
-from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.mailinglist import Personalization, ReplyToMunging
 from mailman.version import VERSION
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/decorate.py b/src/mailman/handlers/decorate.py
index 7f5519fd0..6a16dfc76 100644
--- a/src/mailman/handlers/decorate.py
+++ b/src/mailman/handlers/decorate.py
@@ -22,13 +22,13 @@ import logging
 
 from email.mime.text import MIMEText
 from email.utils import formataddr
-from mailman import public
 from mailman.core.i18n import _
 from mailman.email.message import Message
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.mailinglist import IListArchiverSet
 from mailman.interfaces.template import ITemplateLoader
 from mailman.utilities.string import expand
+from public import public
 from zope.component import getUtility
 from zope.interface import implementer
 
diff --git a/src/mailman/handlers/file_recipients.py b/src/mailman/handlers/file_recipients.py
index 95160706a..e283d936e 100644
--- a/src/mailman/handlers/file_recipients.py
+++ b/src/mailman/handlers/file_recipients.py
@@ -20,9 +20,9 @@
 import os
 import errno
 
-from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/member_recipients.py b/src/mailman/handlers/member_recipients.py
index ffcecfb18..309603ef0 100644
--- a/src/mailman/handlers/member_recipients.py
+++ b/src/mailman/handlers/member_recipients.py
@@ -23,13 +23,13 @@ on the `recipients' attribute of the message.  This attribute is used by the
 SendmailDeliver and BulkDeliver modules.
 """
 
-from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.member import DeliveryStatus
 from mailman.interfaces.pipeline import RejectMessage
 from mailman.utilities.string import wrap
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/mime_delete.py b/src/mailman/handlers/mime_delete.py
index b88c40b0c..ac56e5dd6 100644
--- a/src/mailman/handlers/mime_delete.py
+++ b/src/mailman/handlers/mime_delete.py
@@ -36,7 +36,6 @@ from email.mime.message import MIMEMessage
 from email.mime.text import MIMEText
 from itertools import count
 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
@@ -45,6 +44,7 @@ from mailman.interfaces.handler import IHandler
 from mailman.interfaces.pipeline import DiscardMessage, RejectMessage
 from mailman.utilities.string import oneline
 from mailman.version import VERSION
+from public import public
 from string import Template
 from zope.interface import implementer
 
diff --git a/src/mailman/handlers/owner_recipients.py b/src/mailman/handlers/owner_recipients.py
index 9ef2568f5..4a4ee9a24 100644
--- a/src/mailman/handlers/owner_recipients.py
+++ b/src/mailman/handlers/owner_recipients.py
@@ -17,11 +17,11 @@
 
 """Calculate the list owner recipients (includes moderators)."""
 
-from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.member import DeliveryStatus
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/replybot.py b/src/mailman/handlers/replybot.py
index a86ccbbf3..e8b9e4fc6 100644
--- a/src/mailman/handlers/replybot.py
+++ b/src/mailman/handlers/replybot.py
@@ -19,7 +19,6 @@
 
 import logging
 
-from mailman import public
 from mailman.core.i18n import _
 from mailman.email.message import UserNotification
 from mailman.interfaces.autorespond import (
@@ -28,6 +27,7 @@ from mailman.interfaces.handler import IHandler
 from mailman.interfaces.usermanager import IUserManager
 from mailman.utilities.datetime import today
 from mailman.utilities.string import expand, wrap
+from public import public
 from zope.component import getUtility
 from zope.interface import implementer
 
diff --git a/src/mailman/handlers/rfc_2369.py b/src/mailman/handlers/rfc_2369.py
index e042bc5e3..7f36dd057 100644
--- a/src/mailman/handlers/rfc_2369.py
+++ b/src/mailman/handlers/rfc_2369.py
@@ -20,12 +20,12 @@
 import logging
 
 from email.utils import formataddr
-from mailman import public
 from mailman.core.i18n import _
 from mailman.handlers.cook_headers import uheader
 from mailman.interfaces.archiver import ArchivePolicy
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.mailinglist import IListArchiverSet
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/subject_prefix.py b/src/mailman/handlers/subject_prefix.py
index ff728d92e..7bb1a3e5d 100644
--- a/src/mailman/handlers/subject_prefix.py
+++ b/src/mailman/handlers/subject_prefix.py
@@ -21,9 +21,9 @@ import re
 
 from contextlib import suppress
 from email.header import Header, decode_header, make_header
-from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
+from public import public
 from zope.interface import implementer
 
 
@@ -162,7 +162,7 @@ class SubjectPrefix:
         if p.search(prefix, 1):
             # The prefix has number, so we should search prefix w/number in
             # subject.  Also, force new style.
-            prefix_pattern = p.sub(r'\s*\d+\s*', prefix_pattern)
+            prefix_pattern = p.sub(r'\\s*\\d+\\s*', prefix_pattern)
         # Substitute %d in prefix with post_id
         with suppress(TypeError):
             prefix = prefix % mlist.post_id
diff --git a/src/mailman/handlers/tagger.py b/src/mailman/handlers/tagger.py
index fb0a24ba5..f7c637085 100644
--- a/src/mailman/handlers/tagger.py
+++ b/src/mailman/handlers/tagger.py
@@ -21,9 +21,9 @@ import re
 import email.iterators
 import email.parser
 
-from mailman import public
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/to_archive.py b/src/mailman/handlers/to_archive.py
index d5b980ab4..d2805ea3e 100644
--- a/src/mailman/handlers/to_archive.py
+++ b/src/mailman/handlers/to_archive.py
@@ -17,11 +17,11 @@
 
 """Add the message to the archives."""
 
-from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.archiver import ArchivePolicy
 from mailman.interfaces.handler import IHandler
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/to_digest.py b/src/mailman/handlers/to_digest.py
index 671a2197c..2de911f46 100644
--- a/src/mailman/handlers/to_digest.py
+++ b/src/mailman/handlers/to_digest.py
@@ -19,11 +19,11 @@
 
 import os
 
-from mailman import public
 from mailman.app.digests import maybe_send_digest_now
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
 from mailman.utilities.mailbox import Mailbox
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/to_outgoing.py b/src/mailman/handlers/to_outgoing.py
index b9fae912c..4726973f2 100644
--- a/src/mailman/handlers/to_outgoing.py
+++ b/src/mailman/handlers/to_outgoing.py
@@ -22,10 +22,10 @@ posted to the list membership.  Anything else that needs to go out to some
 recipient should just be placed in the out queue directly.
 """
 
-from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
+from public import public
 from zope.interface import implementer
 
 
diff --git a/src/mailman/handlers/to_usenet.py b/src/mailman/handlers/to_usenet.py
index 4bfa00c5f..f5e01ef6e 100644
--- a/src/mailman/handlers/to_usenet.py
+++ b/src/mailman/handlers/to_usenet.py
@@ -19,10 +19,10 @@
 
 import logging
 
-from mailman import public
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.interfaces.handler import IHandler
+from public import public
 from zope.interface import implementer