7 files changed, 4 insertions, 11 deletions
diff --git a/mailman/pipeline/acknowledge.py b/mailman/pipeline/acknowledge.py
index 1e42f5049..f1bd585f6 100644
--- a/mailman/pipeline/acknowledge.py
+++ b/mailman/pipeline/acknowledge.py
@@ -28,7 +28,6 @@ from zope.interface import implements
 
 from mailman import Message
 from mailman import Utils
-from mailman.config import config
 from mailman.i18n import _
 from mailman.interfaces.handler import IHandler
 
diff --git a/mailman/pipeline/avoid_duplicates.py b/mailman/pipeline/avoid_duplicates.py
index d7e920e81..10c047004 100644
--- a/mailman/pipeline/avoid_duplicates.py
+++ b/mailman/pipeline/avoid_duplicates.py
@@ -30,7 +30,6 @@ __all__ = ['AvoidDuplicates']
 from email.Utils import getaddresses, formataddr
 from zope.interface import implements
 
-from mailman.config import config
 from mailman.i18n import _
 from mailman.interfaces.handler import IHandler
 
diff --git a/mailman/pipeline/calculate_recipients.py b/mailman/pipeline/calculate_recipients.py
index 8f1310ab8..9385c64e8 100644
--- a/mailman/pipeline/calculate_recipients.py
+++ b/mailman/pipeline/calculate_recipients.py
@@ -28,7 +28,6 @@ __all__ = ['CalculateRecipients']
 
 from zope.interface import implements
 
-from mailman import Message
 from mailman import Utils
 from mailman.config import config
 from mailman.core import errors
diff --git a/mailman/pipeline/cook_headers.py b/mailman/pipeline/cook_headers.py
index d8d5e3651..88051970e 100644
--- a/mailman/pipeline/cook_headers.py
+++ b/mailman/pipeline/cook_headers.py
@@ -25,7 +25,6 @@ __all__ = [
 
 import re
 
-from email.charset import Charset
 from email.errors import HeaderParseError
 from email.header import Header, decode_header, make_header
 from email.utils import parseaddr, formataddr, getaddresses
@@ -33,7 +32,6 @@ from zope.interface import implements
 
 from mailman import Utils
 from mailman.config import config
-from mailman.core.plugins import get_plugins
 from mailman.i18n import _
 from mailman.interfaces.handler import IHandler
 from mailman.interfaces.mailinglist import Personalization, ReplyToMunging
@@ -319,12 +317,12 @@ def ch_oneline(headerstr):
         # At this point, we should rstrip() every string because some
         # MUA deliberately add trailing spaces when composing return
         # message.
-        d = [(s.rstrip(),c) for (s,c) in d]
+        d = [(s.rstrip(), c) for (s, c) in d]
         # Find all charsets in the original header.  We use 'utf-8' rather
         # than using the first charset (in mailman 2.1.x) if multiple
         # charsets are used.
         csets = []
-        for (s,c) in d:
+        for (s, c) in d:
             if c and c not in csets:
                 csets.append(c)
         if len(csets) == 0:
diff --git a/mailman/pipeline/decorate.py b/mailman/pipeline/decorate.py
index 2a7e7b065..bf9fbea80 100644
--- a/mailman/pipeline/decorate.py
+++ b/mailman/pipeline/decorate.py
@@ -28,7 +28,6 @@ from email.MIMEText import MIMEText
 from string import Template
 from zope.interface import implements
 
-from mailman import Defaults
 from mailman import Utils
 from mailman.Message import Message
 from mailman.config import config
diff --git a/mailman/pipeline/mime_delete.py b/mailman/pipeline/mime_delete.py
index 0245e347a..c7e27bd5f 100644
--- a/mailman/pipeline/mime_delete.py
+++ b/mailman/pipeline/mime_delete.py
@@ -37,7 +37,6 @@ from email.Iterators import typed_subpart_iterator
 from os.path import splitext
 from zope.interface import implements
 
-from mailman.Message import UserNotification
 from mailman.Utils import oneline
 from mailman.config import config
 from mailman.core import errors
@@ -217,7 +216,8 @@ def to_plaintext(msg):
             try:
                 os.unlink(filename)
             except OSError, e:
-                if e.errno <> errno.ENOENT: raise
+                if e.errno <> errno.ENOENT:
+                    raise
         # Now replace the payload of the subpart and twiddle the Content-Type:
         del subpart['content-transfer-encoding']
         subpart.set_payload(plaintext)
diff --git a/mailman/pipeline/smtp_direct.py b/mailman/pipeline/smtp_direct.py
index 9d2019ec4..09b2223d6 100644
--- a/mailman/pipeline/smtp_direct.py
+++ b/mailman/pipeline/smtp_direct.py
@@ -34,7 +34,6 @@ __all__ = [
 
 import copy
 import time
-import email
 import socket
 import logging
 import smtplib