From f6d998b93b0dd8978eadc9abc4c3964e3fe66bf7 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Sun, 4 Jan 2009 19:41:05 -0500 Subject: Picking some (py)lint. --- mailman/queue/bounce.py | 5 +---- mailman/queue/command.py | 7 +------ mailman/queue/incoming.py | 1 - mailman/queue/lmtp.py | 5 ++--- mailman/queue/maildir.py | 9 +++++---- mailman/queue/news.py | 1 - mailman/queue/outgoing.py | 8 ++------ mailman/queue/pipeline.py | 1 - mailman/queue/virgin.py | 1 - 9 files changed, 11 insertions(+), 27 deletions(-) (limited to 'mailman/queue') diff --git a/mailman/queue/bounce.py b/mailman/queue/bounce.py index e098ba866..ce5040982 100644 --- a/mailman/queue/bounce.py +++ b/mailman/queue/bounce.py @@ -23,17 +23,14 @@ import cPickle import logging import datetime -from email.MIMEMessage import MIMEMessage -from email.MIMEText import MIMEText from email.Utils import parseaddr from mailman import Defaults from mailman import Utils from mailman.Bouncers import BouncerAPI -from mailman.Message import UserNotification from mailman.config import config from mailman.i18n import _ -from mailman.queue import Runner, Switchboard +from mailman.queue import Runner COMMASPACE = ', ' diff --git a/mailman/queue/command.py b/mailman/queue/command.py index 983f6e77a..45c9693b5 100644 --- a/mailman/queue/command.py +++ b/mailman/queue/command.py @@ -29,21 +29,16 @@ __all__ = [ # -owner. import re -import sys import logging from StringIO import StringIO from email.Errors import HeaderParseError -from email.Header import decode_header, make_header, Header +from email.Header import decode_header, make_header from email.Iterators import typed_subpart_iterator -from email.MIMEMessage import MIMEMessage -from email.MIMEText import MIMEText from zope.interface import implements from mailman import Defaults from mailman import Message -from mailman import Utils -from mailman.app.replybot import autorespond_to_sender from mailman.config import config from mailman.i18n import _ from mailman.interfaces.command import ContinueProcessing, IEmailResults diff --git a/mailman/queue/incoming.py b/mailman/queue/incoming.py index ae78e1a81..1adda6629 100644 --- a/mailman/queue/incoming.py +++ b/mailman/queue/incoming.py @@ -26,7 +26,6 @@ prepared for delivery. Rejections, discards, and holds are processed immediately. """ -from mailman.config import config from mailman.core.chains import process from mailman.queue import Runner diff --git a/mailman/queue/lmtp.py b/mailman/queue/lmtp.py index 1f45732a3..f52c99fae 100644 --- a/mailman/queue/lmtp.py +++ b/mailman/queue/lmtp.py @@ -34,7 +34,6 @@ See the variable USE_LMTP in Defaults.py.in for enabling this delivery mechanism. """ -import os import email import smtpd import logging @@ -194,8 +193,8 @@ class LMTPRunner(Runner, smtpd.SMTPServer): msgdata['tolist'] = True queue = 'in' elif subaddress == 'request': - msgdata['torequest'] = True - queue = 'command' + msgdata['torequest'] = True + queue = 'command' else: elog.error('Unknown sub-address: %s', subaddress) status.append(ERR_550) diff --git a/mailman/queue/maildir.py b/mailman/queue/maildir.py index e12550cb5..e8d454d39 100644 --- a/mailman/queue/maildir.py +++ b/mailman/queue/maildir.py @@ -64,14 +64,14 @@ log = logging.getLogger('mailman.error') # We only care about the listname and the subq as in listname@ or # listname-request@ -subqnames = ('admin','bounces','confirm','join','leave', - 'owner','request','subscribe','unsubscribe') +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. if config.POSTFIX_STYLE_VIRTUAL_DOMAINS: - p = localpart.split(config.POSTFIX_VIRTUAL_SEPARATOR,1) + p = localpart.split(config.POSTFIX_VIRTUAL_SEPARATOR, 1) if len(p) == 2: localpart, domain = p l = localpart.split('-') @@ -105,7 +105,8 @@ class MaildirRunner(Runner): try: files = os.listdir(self._dir) except OSError, e: - if e.errno <> errno.ENOENT: raise + if e.errno <> errno.ENOENT: + raise # Nothing's been delivered yet return 0 for file in files: diff --git a/mailman/queue/news.py b/mailman/queue/news.py index 98735d498..ec744208d 100644 --- a/mailman/queue/news.py +++ b/mailman/queue/news.py @@ -24,7 +24,6 @@ import logging import nntplib from cStringIO import StringIO -from email.utils import getaddresses, make_msgid COMMASPACE = ', ' diff --git a/mailman/queue/outgoing.py b/mailman/queue/outgoing.py index 14ba869dc..ed648cca0 100644 --- a/mailman/queue/outgoing.py +++ b/mailman/queue/outgoing.py @@ -18,19 +18,15 @@ """Outgoing queue runner.""" import os -import sys -import copy -import email import socket import logging from datetime import datetime from mailman import Defaults -from mailman import Message from mailman.config import config from mailman.core import errors -from mailman.queue import Runner, Switchboard +from mailman.queue import Runner from mailman.queue.bounce import BounceMixin # This controls how often _do_periodic() will try to deal with deferred @@ -67,7 +63,7 @@ class OutgoingRunner(Runner, BounceMixin): self._func(mlist, msg, msgdata) # Failsafe -- a child may have leaked through. if pid <> os.getpid(): - log.error('child process leaked thru: %s', modname) + log.error('child process leaked thru: %s', pid) os._exit(1) self._logged = False except socket.error: diff --git a/mailman/queue/pipeline.py b/mailman/queue/pipeline.py index f0a42f729..6566b75df 100644 --- a/mailman/queue/pipeline.py +++ b/mailman/queue/pipeline.py @@ -23,7 +23,6 @@ headers, calculates message recipients, and more. """ from mailman.core.pipelines import process -from mailman.config import config from mailman.queue import Runner diff --git a/mailman/queue/virgin.py b/mailman/queue/virgin.py index ca61074bf..b163d3ea2 100644 --- a/mailman/queue/virgin.py +++ b/mailman/queue/virgin.py @@ -24,7 +24,6 @@ recipient. """ from mailman.core.pipelines import process -from mailman.config import config from mailman.queue import Runner -- cgit v1.2.3-70-g09d2