6 files changed, 18 insertions, 16 deletions
diff --git a/src/mailman/queue/__init__.py b/src/mailman/queue/__init__.py
index 901e99cfc..8abc5e9a6 100644
--- a/src/mailman/queue/__init__.py
+++ b/src/mailman/queue/__init__.py
@@ -462,6 +462,7 @@ class Runner:
 
     def _clean_up(self):
         """See `IRunner`."""
+        pass
 
     def _dispose(self, mlist, msg, msgdata):
         """See `IRunner`."""
diff --git a/src/mailman/queue/archive.py b/src/mailman/queue/archive.py
index 24dab34f5..99682f310 100644
--- a/src/mailman/queue/archive.py
+++ b/src/mailman/queue/archive.py
@@ -27,7 +27,7 @@ import os
 import logging
 
 from datetime import datetime
-from email.Utils import parsedate_tz, mktime_tz, formatdate
+from email.utils import parsedate_tz, mktime_tz, formatdate
 from flufl.lock import Lock
 from lazr.config import as_timedelta
 
diff --git a/src/mailman/queue/bounce.py b/src/mailman/queue/bounce.py
index a53b2d072..968659352 100644
--- a/src/mailman/queue/bounce.py
+++ b/src/mailman/queue/bounce.py
@@ -23,7 +23,7 @@ import cPickle
 import logging
 import datetime
 
-from email.Utils import parseaddr
+from email.utils import parseaddr
 from lazr.config import as_timedelta
 
 from mailman.config import config
diff --git a/src/mailman/queue/digest.py b/src/mailman/queue/digest.py
index aaade6c4d..075335158 100644
--- a/src/mailman/queue/digest.py
+++ b/src/mailman/queue/digest.py
@@ -38,7 +38,6 @@ from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.utils import formatdate, getaddresses, make_msgid
 
-from mailman.Utils import maketext, oneline, wrap
 from mailman.config import config
 from mailman.core.errors import DiscardMessage
 from mailman.core.i18n import _
@@ -46,7 +45,9 @@ from mailman.interfaces.member import DeliveryMode, DeliveryStatus
 from mailman.pipeline.decorate import decorate
 from mailman.pipeline.scrubber import process as scrubber
 from mailman.queue import Runner
+from mailman.utilities.i18n import make
 from mailman.utilities.mailbox import Mailbox
+from mailman.utilities.string import oneline, wrap
 
 
 
@@ -75,15 +76,14 @@ class Digester:
         # digest header are separate MIME subobjects.  In either case, it's
         # the first thing in the digest, and we can calculate it now, so go
         # ahead and add it now.
-        self._masthead = maketext(
-            'masthead.txt', dict(
-                real_name=mlist.real_name,
-                got_list_email=mlist.posting_address,
-                got_listinfo_url=mlist.script_url('listinfo'),
-                got_request_email=mlist.request_address,
-                got_owner_email=mlist.owner_address,
-                ),
-            mlist=mlist)
+        self._masthead = make('masthead.txt',
+                              mailing_list=mlist,
+                              real_name=mlist.real_name,
+                              got_list_email=mlist.posting_address,
+                              got_listinfo_url=mlist.script_url('listinfo'),
+                              got_request_email=mlist.request_address,
+                              got_owner_email=mlist.owner_address,
+                              )
         # Set things up for the table of contents.
         self._header = decorate(mlist, mlist.digest_header)
         self._toc = StringIO()
diff --git a/src/mailman/queue/maildir.py b/src/mailman/queue/maildir.py
index 3d0b9497c..fe4dc9da1 100644
--- a/src/mailman/queue/maildir.py
+++ b/src/mailman/queue/maildir.py
@@ -53,8 +53,8 @@ import os
 import errno
 import logging
 
-from email.Parser import Parser
-from email.Utils import parseaddr
+from email.parser import Parser
+from email.utils import parseaddr
 
 from mailman.config import config
 from mailman.message import Message
diff --git a/src/mailman/queue/news.py b/src/mailman/queue/news.py
index dcb0deba6..a3d915244 100644
--- a/src/mailman/queue/news.py
+++ b/src/mailman/queue/news.py
@@ -24,8 +24,8 @@ import logging
 import nntplib
 
 from cStringIO import StringIO
+from lazr.config import as_host_port
 
-from mailman import Utils
 from mailman.config import config
 from mailman.interfaces.nntp import NewsModeration
 from mailman.queue import Runner
@@ -61,7 +61,8 @@ class NewsRunner(Runner):
             conn = None
             try:
                 try:
-                    nntp_host, nntp_port = Utils.nntpsplit(mlist.nntp_host)
+                    nntp_host, nntp_port = as_host_port(
+                        mlist.nntp_host, default_port=119)
                     conn = nntplib.NNTP(nntp_host, nntp_port,
                                         readermode=True,
                                         user=config.nntp.username,