8 files changed, 8 insertions, 13 deletions
diff --git a/src/mailman/queue/__init__.py b/src/mailman/queue/__init__.py
index 4e8ba35e2..9666925a1 100644
--- a/src/mailman/queue/__init__.py
+++ b/src/mailman/queue/__init__.py
@@ -34,15 +34,12 @@ __all__ = [
 
 
 import os
-import sys
 import time
 import email
-import errno
 import pickle
 import cPickle
 import hashlib
 import logging
-import marshal
 import traceback
 
 from cStringIO import StringIO
diff --git a/src/mailman/queue/archive.py b/src/mailman/queue/archive.py
index 65c1e066e..42a3d301a 100644
--- a/src/mailman/queue/archive.py
+++ b/src/mailman/queue/archive.py
@@ -24,13 +24,11 @@ __all__ = [
 
 
 import os
-import sys
-import time
 import logging
 
 from datetime import datetime
 from email.Utils import parsedate_tz, mktime_tz, formatdate
-from lazr.config import as_boolean, as_timedelta
+from lazr.config import as_timedelta
 from locknix.lockfile import Lock
 
 from mailman.config import config
diff --git a/src/mailman/queue/bounce.py b/src/mailman/queue/bounce.py
index fcf5a4151..6be2bca68 100644
--- a/src/mailman/queue/bounce.py
+++ b/src/mailman/queue/bounce.py
@@ -26,7 +26,6 @@ import datetime
 from email.Utils import parseaddr
 from lazr.config import as_timedelta
 
-from mailman.app.bounces import scan_message
 from mailman.config import config
 from mailman.core.i18n import _
 from mailman.email.utils import split_email
diff --git a/src/mailman/queue/command.py b/src/mailman/queue/command.py
index ea86ca17a..f93d9fd42 100644
--- a/src/mailman/queue/command.py
+++ b/src/mailman/queue/command.py
@@ -40,7 +40,7 @@ from zope.interface import implements
 
 from mailman.config import config
 from mailman.core.i18n import _
-from mailman.email.message import Message, UserNotification
+from mailman.email.message import UserNotification
 from mailman.interfaces.command import ContinueProcessing, IEmailResults
 from mailman.interfaces.languages import ILanguageManager
 from mailman.queue import Runner
diff --git a/src/mailman/queue/digest.py b/src/mailman/queue/digest.py
index 0d1e458d2..46228580d 100644
--- a/src/mailman/queue/digest.py
+++ b/src/mailman/queue/digest.py
@@ -130,7 +130,7 @@ class Digester:
         # through in the digest messages.
         keepers = {}
         for header in self._keepers:
-            keepers[header] = msg.get_all(keeper, [])
+            keepers[header] = msg.get_all(header, [])
         # Remove all the unkempt <wink> headers.  Use .keys() to allow for
         # destructive iteration...
         for header in msg.keys():
diff --git a/src/mailman/queue/lmtp.py b/src/mailman/queue/lmtp.py
index 3db4ad4c7..dcca201e8 100644
--- a/src/mailman/queue/lmtp.py
+++ b/src/mailman/queue/lmtp.py
@@ -217,7 +217,7 @@ class LMTPRunner(Runner, smtpd.SMTPServer):
                     qlog.debug('%s subaddress: %s, queue: %s',
                                message_id, canonical_subaddress, queue)
                     status.append('250 Ok')
-            except Exception, e:
+            except Exception:
                 elog.exception('Queue detection: %s', msg['message-id'])
                 config.db.abort()
                 status.append(ERR_550)
diff --git a/src/mailman/queue/maildir.py b/src/mailman/queue/maildir.py
index 64bb511ea..7d95356f4 100644
--- a/src/mailman/queue/maildir.py
+++ b/src/mailman/queue/maildir.py
@@ -58,7 +58,8 @@ from email.Utils import parseaddr
 
 from mailman.config import config
 from mailman.message import Message
-from mailman.queue import Runner
+from mailman.queue import Runner, Switchboard
+
 
 log = logging.getLogger('mailman.error')
 
@@ -67,6 +68,7 @@ log = logging.getLogger('mailman.error')
 subqnames = ('admin', 'bounces', 'confirm', 'join', 'leave',
              'owner', 'request', 'subscribe', 'unsubscribe')
 
+
 def getlistq(address):
     localpart, domain = address.split('@', 1)
     # TK: FIXME I only know configs of Postfix.
@@ -83,6 +85,7 @@ def getlistq(address):
         subq = None
     return listname, subq, domain
 
+
 
 class MaildirRunner(Runner):
     # This class is much different than most runners because it pulls files
diff --git a/src/mailman/queue/outgoing.py b/src/mailman/queue/outgoing.py
index c97eba098..35e8b5618 100644
--- a/src/mailman/queue/outgoing.py
+++ b/src/mailman/queue/outgoing.py
@@ -17,8 +17,6 @@
 
 """Outgoing queue runner."""
 
-import os
-import sys
 import socket
 import logging