diff options
Diffstat (limited to 'src')
68 files changed, 59 insertions, 118 deletions
diff --git a/src/mailman/Utils.py b/src/mailman/Utils.py index 44058573f..65420a495 100644 --- a/src/mailman/Utils.py +++ b/src/mailman/Utils.py @@ -32,12 +32,10 @@ __all__ = [ import os import re import cgi -import time import errno import base64 import random import logging -import htmlentitydefs # pylint: disable-msg=E0611,W0403 from email.errors import HeaderParseError @@ -50,7 +48,6 @@ import mailman.templates from mailman import passwords from mailman.config import config -from mailman.core import errors from mailman.core.i18n import _ from mailman.interfaces.languages import ILanguageManager from mailman.utilities.string import expand @@ -441,7 +438,7 @@ def uncanonstr(s, lang=None): if isinstance(s, unicode): return s.encode(charset) else: - u = unicode(s, charset) + unicode(s, charset) return s except UnicodeError: # Nope, it contains funny characters, so html-ref it diff --git a/src/mailman/app/membership.py b/src/mailman/app/membership.py index d24522b8f..5682d17b2 100644 --- a/src/mailman/app/membership.py +++ b/src/mailman/app/membership.py @@ -31,7 +31,6 @@ from zope.component import getUtility from mailman import Utils from mailman.app.notifications import send_goodbye_message -from mailman.core import errors from mailman.core.i18n import _ from mailman.email.message import OwnerNotification from mailman.email.validate import validate diff --git a/src/mailman/app/registrar.py b/src/mailman/app/registrar.py index 36a93b16e..c68c98691 100644 --- a/src/mailman/app/registrar.py +++ b/src/mailman/app/registrar.py @@ -31,7 +31,6 @@ from pkg_resources import resource_string from zope.component import getUtility from zope.interface import implements -from mailman.config import config from mailman.core.i18n import _ from mailman.email.message import UserNotification from mailman.email.validate import validate @@ -73,8 +72,8 @@ class Registrar: # message and confirm through the web. subject = 'confirm ' + token confirm_address = mlist.confirm_address(token) - confirm_url = mlist.domain.confirm_url(token) # For i18n interpolation. + confirm_url = mlist.domain.confirm_url(token) email_address = address domain_name = mlist.domain.email_host contact_address = mlist.domain.contact_address diff --git a/src/mailman/app/replybot.py b/src/mailman/app/replybot.py index 6cc344960..9deda749c 100644 --- a/src/mailman/app/replybot.py +++ b/src/mailman/app/replybot.py @@ -30,8 +30,6 @@ __all__ = [ import logging -from mailman.core.i18n import _ - log = logging.getLogger('mailman.vette') diff --git a/src/mailman/archiving/pipermail.py b/src/mailman/archiving/pipermail.py index f4131b294..a6ccf1dbc 100644 --- a/src/mailman/archiving/pipermail.py +++ b/src/mailman/archiving/pipermail.py @@ -29,7 +29,6 @@ import os import mailbox import tempfile -from cStringIO import StringIO from zope.interface import implements from zope.interface.interface import adapter_hooks @@ -95,7 +94,7 @@ class Pipermail: def list_url(mlist): """See `IArchiver`.""" if mlist.archive_private: - url = mlist.script_url('private') + '/index.html' + return mlist.script_url('private') + '/index.html' else: return expand(config.archiver.pipermail.base_url, dict(listname=mlist.fqdn_listname, diff --git a/src/mailman/archiving/prototype.py b/src/mailman/archiving/prototype.py index 44e2a9e34..a4a3e3024 100644 --- a/src/mailman/archiving/prototype.py +++ b/src/mailman/archiving/prototype.py @@ -31,7 +31,6 @@ from base64 import b32encode from urlparse import urljoin from zope.interface import implements -from mailman.config import config from mailman.interfaces.archiver import IArchiver diff --git a/src/mailman/bin/bumpdigests.py b/src/mailman/bin/bumpdigests.py index c462fc9f8..d90dbc576 100644 --- a/src/mailman/bin/bumpdigests.py +++ b/src/mailman/bin/bumpdigests.py @@ -58,7 +58,7 @@ def main(): try: # Be sure the list is locked mlist = MailList.MailList(listname) - except errors.MMListError, e: + except errors.MMListError: parser.print_help() print >> sys.stderr, _('No such list: $listname') sys.exit(1) diff --git a/src/mailman/bin/master.py b/src/mailman/bin/master.py index 96b265864..0d0276fdb 100644 --- a/src/mailman/bin/master.py +++ b/src/mailman/bin/master.py @@ -27,13 +27,12 @@ __all__ = [ import os import sys -import time import errno import signal import socket import logging -from datetime import datetime, timedelta +from datetime import timedelta from flufl.enum import Enum from lazr.config import as_boolean from locknix import lockfile @@ -119,7 +118,8 @@ def get_lock_data(): with open(config.LOCK_FILE) as fp: filename = os.path.split(fp.read().strip())[1] parts = filename.split('.') - timestamp = parts.pop() + # Ignore the timestamp. + parts.pop() pid = parts.pop() hostname = parts.pop() filename = DOT.join(reversed(parts)) diff --git a/src/mailman/bin/qrunner.py b/src/mailman/bin/qrunner.py index 67d2d9abb..cca8b1dae 100644 --- a/src/mailman/bin/qrunner.py +++ b/src/mailman/bin/qrunner.py @@ -148,7 +148,7 @@ def make_qrunner(name, slice, range, once=False): class_path = name try: qrclass = find_name(class_path) - except ImportError as error: + except ImportError: if os.environ.get('MAILMAN_UNDER_MASTER_CONTROL') is not None: # Exit with SIGTERM exit code so the master watcher won't try to # restart us. diff --git a/src/mailman/bouncers/caiwireless.py b/src/mailman/bouncers/caiwireless.py index 69b9dc753..8c35d8103 100644 --- a/src/mailman/bouncers/caiwireless.py +++ b/src/mailman/bouncers/caiwireless.py @@ -48,6 +48,8 @@ class ParseState(Enum): class Caiwireless: """Parse mystery style generated by MTA at caiwireless.net.""" + implements(IBounceDetector) + def process(self, msg): if msg.get_content_type() != 'multipart/mixed': return None diff --git a/src/mailman/bouncers/microsoft.py b/src/mailman/bouncers/microsoft.py index bc17bcaf9..6204fa5e0 100644 --- a/src/mailman/bouncers/microsoft.py +++ b/src/mailman/bouncers/microsoft.py @@ -46,6 +46,8 @@ class ParseState(Enum): class Microsoft: """Microsoft's `SMTPSVC' nears I kin tell.""" + implements(IBounceDetector) + def process(self, msg): if msg.get_content_type() != 'multipart/mixed': return None diff --git a/src/mailman/chains/hold.py b/src/mailman/chains/hold.py index f5ff237d9..741282d18 100644 --- a/src/mailman/chains/hold.py +++ b/src/mailman/chains/hold.py @@ -102,16 +102,16 @@ def autorespond_to_sender(mlist, sender, lang=None): log.info('hold autoresponse limit hit: %s', sender) response_set.response_sent(address, Response.hold) # Send this notification message instead. - text = Utils.maketext( + text = maketext( 'nomoretoday.txt', {'sender' : sender, 'listname': mlist.fqdn_listname, - 'num' : count, + 'num' : todays_count, 'owneremail': mlist.owner_address, }, lang=lang) with _.using(lang.code): - msg = Message.UserNotification( + msg = UserNotification( sender, mlist.owner_address, _('Last autoresponse notification for today'), text, lang=lang) diff --git a/src/mailman/commands/cli_qfile.py b/src/mailman/commands/cli_qfile.py index 63e5344e1..dbb280c55 100644 --- a/src/mailman/commands/cli_qfile.py +++ b/src/mailman/commands/cli_qfile.py @@ -28,10 +28,8 @@ __all__ = [ import cPickle from pprint import PrettyPrinter -from zope.component import getUtility from zope.interface import implements -from mailman.config import config from mailman.core.i18n import _ from mailman.interact import interact from mailman.interfaces.command import ICLISubCommand diff --git a/src/mailman/commands/cli_withlist.py b/src/mailman/commands/cli_withlist.py index 3bd2046a1..d585ed70e 100644 --- a/src/mailman/commands/cli_withlist.py +++ b/src/mailman/commands/cli_withlist.py @@ -26,7 +26,6 @@ __all__ = [ import re -import sys from zope.component import getUtility from zope.interface import implements diff --git a/src/mailman/commands/eml_membership.py b/src/mailman/commands/eml_membership.py index 17dc0d0d6..26d96ce3c 100644 --- a/src/mailman/commands/eml_membership.py +++ b/src/mailman/commands/eml_membership.py @@ -32,7 +32,6 @@ from email.utils import formataddr, parseaddr from zope.component import getUtility from zope.interface import implements -from mailman.config import config from mailman.core.i18n import _ from mailman.interfaces.command import ContinueProcessing, IEmailCommand from mailman.interfaces.member import DeliveryMode diff --git a/src/mailman/config/config.py b/src/mailman/config/config.py index 6d0e48ef1..19bbf809b 100644 --- a/src/mailman/config/config.py +++ b/src/mailman/config/config.py @@ -27,8 +27,6 @@ __all__ = [ import os import sys -import errno -import logging from lazr.config import ConfigSchema, as_boolean from pkg_resources import resource_stream @@ -37,7 +35,6 @@ from zope.component import getUtility from zope.interface import Interface, implements from mailman import version -from mailman.core import errors from mailman.interfaces.languages import ILanguageManager from mailman.styles.manager import StyleManager from mailman.utilities.filesystem import makedirs diff --git a/src/mailman/core/errors.py b/src/mailman/core/errors.py index 3faa46884..2c5568b6d 100644 --- a/src/mailman/core/errors.py +++ b/src/mailman/core/errors.py @@ -35,7 +35,6 @@ __all__ = [ 'BadPasswordSchemeError', 'CantDigestError', 'DiscardMessage', - 'EmailAddressError', 'HandlerError', 'HoldMessage', 'LostHeldMessage', @@ -43,7 +42,6 @@ __all__ = [ 'MailmanException', 'MemberError', 'MustDigestError', - 'NotAMemberError', 'PasswordError', 'RejectMessage', ] diff --git a/src/mailman/core/i18n.py b/src/mailman/core/i18n.py index 372a4685d..48e664f1f 100644 --- a/src/mailman/core/i18n.py +++ b/src/mailman/core/i18n.py @@ -24,7 +24,6 @@ __all__ = [ '_', 'ctime', 'initialize', - 'set_language', ] diff --git a/src/mailman/core/initialize.py b/src/mailman/core/initialize.py index e55e97ee5..f64e267d7 100644 --- a/src/mailman/core/initialize.py +++ b/src/mailman/core/initialize.py @@ -37,7 +37,6 @@ __all__ = [ import os -import sys from pkg_resources import resource_string from zope.configuration import xmlconfig diff --git a/src/mailman/core/pipelines.py b/src/mailman/core/pipelines.py index ffd196f85..66a47eac0 100644 --- a/src/mailman/core/pipelines.py +++ b/src/mailman/core/pipelines.py @@ -116,7 +116,7 @@ def initialize(): verifyObject(IHandler, handler) assert handler.name not in config.handlers, ( 'Duplicate handler "{0}" found in {1}'.format( - handler.name, handler_finder)) + handler.name, handler_class)) config.handlers[handler.name] = handler # Set up some pipelines. for pipeline_class in (BuiltInPipeline, VirginPipeline): diff --git a/src/mailman/core/rules.py b/src/mailman/core/rules.py index 015d0d2e4..38f09d39f 100644 --- a/src/mailman/core/rules.py +++ b/src/mailman/core/rules.py @@ -41,5 +41,5 @@ def initialize(): verifyObject(IRule, rule) assert rule.name not in config.rules, ( 'Duplicate rule "{0}" found in {1}'.format( - rule.name, rule_finder)) + rule.name, rule_class)) config.rules[rule.name] = rule diff --git a/src/mailman/database/stock.py b/src/mailman/database/stock.py index 047b76cb9..e3c802455 100644 --- a/src/mailman/database/stock.py +++ b/src/mailman/database/stock.py @@ -37,9 +37,6 @@ import mailman.version from mailman.config import config from mailman.interfaces.database import IDatabase, SchemaVersionMismatchError -from mailman.model.messagestore import MessageStore -from mailman.model.pending import Pendings -from mailman.model.requests import Requests from mailman.model.version import Version from mailman.utilities.string import expand diff --git a/src/mailman/database/types.py b/src/mailman/database/types.py index a4e76a7e8..707fd345c 100644 --- a/src/mailman/database/types.py +++ b/src/mailman/database/types.py @@ -26,8 +26,6 @@ __all__ = [ ] -import sys - from storm.properties import SimpleProperty from storm.variables import Variable diff --git a/src/mailman/email/message.py b/src/mailman/email/message.py index ec3753eab..773040bd7 100644 --- a/src/mailman/email/message.py +++ b/src/mailman/email/message.py @@ -33,14 +33,11 @@ __all__ = [ ] -import re import email import email.message import email.utils -from email.charset import Charset from email.header import Header -from lazr.config import as_boolean from mailman.config import config diff --git a/src/mailman/interfaces/bounce.py b/src/mailman/interfaces/bounce.py index d5c7e087b..e2effd6b1 100644 --- a/src/mailman/interfaces/bounce.py +++ b/src/mailman/interfaces/bounce.py @@ -22,7 +22,7 @@ from __future__ import absolute_import, unicode_literals __metaclass__ = type __all__ = [ 'IBounceDetector', - 'Stop', + 'NonFatal', ] diff --git a/src/mailman/interfaces/database.py b/src/mailman/interfaces/database.py index 42a0b2e34..514e5db15 100644 --- a/src/mailman/interfaces/database.py +++ b/src/mailman/interfaces/database.py @@ -26,7 +26,8 @@ __all__ = [ 'SchemaVersionMismatchError', ] -from zope.interface import Interface, Attribute + +from zope.interface import Interface from mailman.interfaces.errors import MailmanError from mailman.version import DATABASE_SCHEMA_VERSION diff --git a/src/mailman/interfaces/domain.py b/src/mailman/interfaces/domain.py index 25727ef22..560844d0c 100644 --- a/src/mailman/interfaces/domain.py +++ b/src/mailman/interfaces/domain.py @@ -30,7 +30,6 @@ __all__ = [ from zope.interface import Interface, Attribute from mailman.core.errors import MailmanError -from mailman.core.i18n import _ diff --git a/src/mailman/interfaces/listmanager.py b/src/mailman/interfaces/listmanager.py index f24230852..d7859a28e 100644 --- a/src/mailman/interfaces/listmanager.py +++ b/src/mailman/interfaces/listmanager.py @@ -30,7 +30,6 @@ __all__ = [ from zope.interface import Interface, Attribute from mailman.interfaces.errors import MailmanError -from mailman.interfaces.mailinglist import IMailingList diff --git a/src/mailman/interfaces/mailinglist.py b/src/mailman/interfaces/mailinglist.py index 53f462d5d..13e026f8c 100644 --- a/src/mailman/interfaces/mailinglist.py +++ b/src/mailman/interfaces/mailinglist.py @@ -21,7 +21,6 @@ from __future__ import absolute_import, unicode_literals __metaclass__ = type __all__ = [ - 'DigestFrequency', 'IAcceptableAlias', 'IAcceptableAliasSet', 'IMailingList', @@ -33,8 +32,6 @@ __all__ = [ from flufl.enum import Enum from zope.interface import Interface, Attribute -from mailman.core.i18n import _ - class Personalization(Enum): diff --git a/src/mailman/interfaces/member.py b/src/mailman/interfaces/member.py index 8e316785b..51caa6f6f 100644 --- a/src/mailman/interfaces/member.py +++ b/src/mailman/interfaces/member.py @@ -94,7 +94,7 @@ class MembershipIsBannedError(MembershipError): """The address is not allowed to subscribe to the mailing list.""" def __init__(self, mlist, address): - super(MembershipIsBanned, self).__init__() + super(MembershipIsBannedError, self).__init__() self._mlist = mlist self._address = address diff --git a/src/mailman/interfaces/membership.py b/src/mailman/interfaces/membership.py index f42516ad1..36cdf0be9 100644 --- a/src/mailman/interfaces/membership.py +++ b/src/mailman/interfaces/membership.py @@ -21,15 +21,12 @@ from __future__ import absolute_import, unicode_literals __metaclass__ = type __all__ = [ - 'SubscriptionService', + 'ISubscriptionService', ] from zope.interface import Interface -from mailman.core.i18n import _ -from mailman.interfaces.member import IMember - class ISubscriptionService(Interface): diff --git a/src/mailman/interfaces/mta.py b/src/mailman/interfaces/mta.py index 95d453a8b..49001ebc6 100644 --- a/src/mailman/interfaces/mta.py +++ b/src/mailman/interfaces/mta.py @@ -35,7 +35,7 @@ from mailman.core.errors import MailmanError class SomeRecipientsFailed(MailmanError): """Delivery to some or all recipients failed""" def __init__(self, temporary_failures, permanent_failures): - HandlerError.__init__(self) + super(SomeRecipientsFailed, self).__init__() self.temporary_failures = temporary_failures self.permanent_failures = permanent_failures diff --git a/src/mailman/interfaces/system.py b/src/mailman/interfaces/system.py index 39156315f..6fa791e56 100644 --- a/src/mailman/interfaces/system.py +++ b/src/mailman/interfaces/system.py @@ -27,8 +27,6 @@ __all__ = [ from zope.interface import Interface, Attribute -from mailman.core.i18n import _ - class ISystem(Interface): diff --git a/src/mailman/model/autorespond.py b/src/mailman/model/autorespond.py index 79eedd34a..efa4bccfd 100644 --- a/src/mailman/model/autorespond.py +++ b/src/mailman/model/autorespond.py @@ -33,8 +33,7 @@ from mailman.config import config from mailman.database.model import Model from mailman.database.types import Enum from mailman.interfaces.autorespond import ( - IAutoResponseRecord, IAutoResponseSet, Response) -from mailman.interfaces.mailinglist import IMailingList + IAutoResponseRecord, IAutoResponseSet) from mailman.utilities.datetime import today diff --git a/src/mailman/model/language.py b/src/mailman/model/language.py index c1870a1b5..407dae952 100644 --- a/src/mailman/model/language.py +++ b/src/mailman/model/language.py @@ -25,7 +25,7 @@ __all__ = [ ] -from storm.locals import * +from storm.locals import Int, Unicode from zope.interface import implements from mailman.database import Model diff --git a/src/mailman/model/member.py b/src/mailman/model/member.py index 34fde5f2f..429d9727d 100644 --- a/src/mailman/model/member.py +++ b/src/mailman/model/member.py @@ -24,7 +24,7 @@ __all__ = [ 'Member', ] -from storm.locals import * +from storm.locals import Bool, Int, Reference, Unicode from zope.interface import implements from mailman.config import config diff --git a/src/mailman/model/message.py b/src/mailman/model/message.py index 3e70b144d..fac47f282 100644 --- a/src/mailman/model/message.py +++ b/src/mailman/model/message.py @@ -25,7 +25,7 @@ __all__ = [ 'Message', ] -from storm.locals import * +from storm.locals import AutoReload, Int, RawStr, Unicode from zope.interface import implements from mailman.config import config diff --git a/src/mailman/model/mime.py b/src/mailman/model/mime.py index 3f4871a1d..e0610916d 100644 --- a/src/mailman/model/mime.py +++ b/src/mailman/model/mime.py @@ -25,7 +25,7 @@ __all__ = [ ] -from storm.locals import Bool, Int, Reference, Unicode +from storm.locals import Int, Reference, Unicode from zope.interface import implements from mailman.database.model import Model diff --git a/src/mailman/model/pending.py b/src/mailman/model/pending.py index ae36703ce..cfa056244 100644 --- a/src/mailman/model/pending.py +++ b/src/mailman/model/pending.py @@ -25,14 +25,14 @@ __all__ = [ 'Pendings', ] -import sys + import time import random import hashlib import datetime from lazr.config import as_timedelta -from storm.locals import * +from storm.locals import DateTime, Int, RawStr, ReferenceSet, Unicode from zope.interface import implements from zope.interface.verify import verifyObject diff --git a/src/mailman/model/preferences.py b/src/mailman/model/preferences.py index a5064957d..a42278105 100644 --- a/src/mailman/model/preferences.py +++ b/src/mailman/model/preferences.py @@ -25,11 +25,10 @@ __all__ = [ ] -from storm.locals import * +from storm.locals import Bool, Int, Unicode from zope.component import getUtility from zope.interface import implements -from mailman.config import config from mailman.database.model import Model from mailman.database.types import Enum from mailman.interfaces.languages import ILanguageManager diff --git a/src/mailman/model/requests.py b/src/mailman/model/requests.py index 78d077879..c1772afd4 100644 --- a/src/mailman/model/requests.py +++ b/src/mailman/model/requests.py @@ -26,7 +26,7 @@ __all__ = [ from datetime import timedelta -from storm.locals import * +from storm.locals import AutoReload, Int, RawStr, Reference, Unicode from zope.component import getUtility from zope.interface import implements diff --git a/src/mailman/model/roster.py b/src/mailman/model/roster.py index daf964581..bffafd809 100644 --- a/src/mailman/model/roster.py +++ b/src/mailman/model/roster.py @@ -37,7 +37,7 @@ __all__ = [ ] -from storm.expr import And, LeftJoin, Or +from storm.expr import And, Or from zope.interface import implements from mailman.config import config @@ -45,7 +45,6 @@ from mailman.interfaces.member import DeliveryMode, MemberRole from mailman.interfaces.roster import IRoster from mailman.model.address import Address from mailman.model.member import Member -from mailman.model.preferences import Preferences diff --git a/src/mailman/model/user.py b/src/mailman/model/user.py index d633c5d17..327a3b184 100644 --- a/src/mailman/model/user.py +++ b/src/mailman/model/user.py @@ -24,7 +24,7 @@ __all__ = [ 'User', ] -from storm.locals import * +from storm.locals import Int, Reference, ReferenceSet, Unicode from zope.interface import implements from mailman.config import config diff --git a/src/mailman/model/version.py b/src/mailman/model/version.py index d56f41353..c2e87ec3a 100644 --- a/src/mailman/model/version.py +++ b/src/mailman/model/version.py @@ -24,7 +24,7 @@ __all__ = [ 'Version', ] -from storm.locals import * +from storm.locals import Int, Unicode from mailman.database.model import Model diff --git a/src/mailman/mta/deliver.py b/src/mailman/mta/deliver.py index 4783296cf..78924d39a 100644 --- a/src/mailman/mta/deliver.py +++ b/src/mailman/mta/deliver.py @@ -28,8 +28,6 @@ __all__ = [ import time import logging -from lazr.config import as_boolean - from mailman.config import config from mailman.interfaces.mailinglist import Personalization from mailman.interfaces.mta import SomeRecipientsFailed @@ -150,9 +148,9 @@ def deliver(mlist, msg, msgdata): template = config.logging.smtp.failure if template.lower() != 'no': substitutions.update( - recip = recip, + recip = recipient, smtpcode = code, - smtpmsg = smtpmsg, + smtpmsg = smtp_message, ) log.info('%s', expand(template, substitutions)) # Return the results diff --git a/src/mailman/mta/postfix.py b/src/mailman/mta/postfix.py index b0fdfb195..0c4604ae5 100644 --- a/src/mailman/mta/postfix.py +++ b/src/mailman/mta/postfix.py @@ -26,10 +26,6 @@ __all__ = [ import os -import grp -import pwd -import time -import errno import logging import datetime @@ -37,9 +33,7 @@ from locknix.lockfile import Lock from zope.component import getUtility from zope.interface import implements -from mailman import Utils from mailman.config import config -from mailman.core.i18n import _ from mailman.interfaces.listmanager import IListManager from mailman.interfaces.mta import IMailTransportAgentAliases diff --git a/src/mailman/mta/verp.py b/src/mailman/mta/verp.py index 00d1104a2..2e8b755fc 100644 --- a/src/mailman/mta/verp.py +++ b/src/mailman/mta/verp.py @@ -68,7 +68,8 @@ class VERPMixin: # deliver it to this person, nor can we craft a valid verp # header. I don't think there's much we can do except ignore # this recipient. - log.info('Skipping VERP delivery to unqual recip: %s', recip) + log.info('Skipping VERP delivery to unqual recip: %s', + recipient) return sender return '{0}@{1}'.format( expand(config.mta.verp_format, dict( diff --git a/src/mailman/pipeline/mime_delete.py b/src/mailman/pipeline/mime_delete.py index 515888001..39b45fa77 100644 --- a/src/mailman/pipeline/mime_delete.py +++ b/src/mailman/pipeline/mime_delete.py @@ -238,7 +238,7 @@ def dispose(mlist, msg, msgdata, why): mlist.ForwardMessage( msg, text=_("""\ -The attached message matched the %(listname)s mailing list's content filtering +The attached message matched the $listname mailing list's content filtering rules and was prevented from being forwarded on to the list membership. You are receiving the only remaining copy of the discarded message. diff --git a/src/mailman/pipeline/moderate.py b/src/mailman/pipeline/moderate.py index a2acf4714..2a59592e5 100644 --- a/src/mailman/pipeline/moderate.py +++ b/src/mailman/pipeline/moderate.py @@ -76,7 +76,7 @@ def process(mlist, msg, msgdata): # Reject text = mlist.member_moderation_notice if text: - text = Utils.wrap(text) + text = wrap(text) else: # Use the default RejectMessage notice string text = None @@ -144,12 +144,12 @@ def do_reject(mlist): listowner = mlist.GetOwnerEmail() if mlist.nonmember_rejection_notice: raise errors.RejectMessage, \ - Utils.wrap(_(mlist.nonmember_rejection_notice)) + wrap(_(mlist.nonmember_rejection_notice)) else: - raise errors.RejectMessage, Utils.wrap(_("""\ + raise errors.RejectMessage, wrap(_("""\ You are not allowed to post to this mailing list, and your message has been automatically rejected. If you think that your messages are being rejected in -error, contact the mailing list owner at %(listowner)s.""")) +error, contact the mailing list owner at ${listowner}.""")) @@ -163,7 +163,7 @@ def do_discard(mlist, msg): _('Auto-discard notification'), lang=mlist.preferred_language) nmsg.set_type('multipart/mixed') - text = MIMEText(Utils.wrap(_( + text = MIMEText(wrap(_( 'The attached message has been automatically discarded.')), _charset=mlist.preferred_language.charset) nmsg.attach(text) diff --git a/src/mailman/pipeline/scrubber.py b/src/mailman/pipeline/scrubber.py index 1f425b54e..c9c7a3f6d 100644 --- a/src/mailman/pipeline/scrubber.py +++ b/src/mailman/pipeline/scrubber.py @@ -27,15 +27,12 @@ __all__ = [ import os import re -import sys import time -import errno import hashlib import logging import binascii from email.charset import Charset -from email.generator import Generator from email.utils import make_msgid, parsedate from lazr.config import as_boolean from locknix.lockfile import Lock 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 diff --git a/src/mailman/rest/adapters.py b/src/mailman/rest/adapters.py index a98798fcb..817032ccf 100644 --- a/src/mailman/rest/adapters.py +++ b/src/mailman/rest/adapters.py @@ -21,7 +21,7 @@ from __future__ import absolute_import, unicode_literals __metaclass__ = type __all__ = [ - 'DomainCollection', + 'SubscriptionService', ] diff --git a/src/mailman/rest/helpers.py b/src/mailman/rest/helpers.py index dc67a699b..2064282b5 100644 --- a/src/mailman/rest/helpers.py +++ b/src/mailman/rest/helpers.py @@ -21,7 +21,6 @@ from __future__ import absolute_import, unicode_literals __metaclass__ = type __all__ = [ - 'ContainerMixin', 'PATCH', 'etag', 'no_content', diff --git a/src/mailman/styles/default.py b/src/mailman/styles/default.py index 6a1b9a4df..907b5b7dc 100644 --- a/src/mailman/styles/default.py +++ b/src/mailman/styles/default.py @@ -30,7 +30,6 @@ import datetime from zope.interface import implements -from mailman.config import config from mailman.core.i18n import _ from mailman.interfaces.action import Action from mailman.interfaces.digests import DigestFrequency diff --git a/src/mailman/styles/manager.py b/src/mailman/styles/manager.py index e08d649f4..ad2f8139a 100644 --- a/src/mailman/styles/manager.py +++ b/src/mailman/styles/manager.py @@ -25,8 +25,6 @@ __all__ = [ ] -import sys - from operator import attrgetter from zope.interface import implements from zope.interface.verify import verifyObject diff --git a/src/mailman/testing/helpers.py b/src/mailman/testing/helpers.py index 67e2ad21a..adcc20aef 100644 --- a/src/mailman/testing/helpers.py +++ b/src/mailman/testing/helpers.py @@ -1,4 +1,3 @@ -# Copyright (C) 2008-2010 by the Free Software Foundation, Inc. # # This file is part of GNU Mailman. # @@ -37,7 +36,6 @@ import time import errno import signal import socket -import logging import smtplib import datetime import threading diff --git a/src/mailman/testing/i18n.py b/src/mailman/testing/i18n.py index 1f97d8df3..44922fe79 100644 --- a/src/mailman/testing/i18n.py +++ b/src/mailman/testing/i18n.py @@ -21,7 +21,8 @@ from __future__ import absolute_import, unicode_literals __metaclass__ = type __all__ = [ - 'install_testing_i18n', + 'TestingStrategy', + 'initialize', ] diff --git a/src/mailman/testing/layers.py b/src/mailman/testing/layers.py index 8f16d5940..97b715131 100644 --- a/src/mailman/testing/layers.py +++ b/src/mailman/testing/layers.py @@ -43,7 +43,6 @@ from zope.component import getUtility from mailman.config import config from mailman.core import initialize from mailman.core.initialize import INHIBIT_CONFIG_FILE -from mailman.core.i18n import _ from mailman.core.logging import get_handler from mailman.interfaces.domain import IDomainManager from mailman.interfaces.messages import IMessageStore diff --git a/src/mailman/tests/test_bounces.py b/src/mailman/tests/test_bounces.py index 2267b6af7..4b4041604 100644 --- a/src/mailman/tests/test_bounces.py +++ b/src/mailman/tests/test_bounces.py @@ -25,8 +25,6 @@ __all__ = [ ] -import os -import sys import email import unittest diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py index 2dfcef2b3..5362b7b45 100644 --- a/src/mailman/utilities/importer.py +++ b/src/mailman/utilities/importer.py @@ -25,7 +25,7 @@ __all__ = [ ] -import cPickle +import sys import datetime from mailman.interfaces.action import Action @@ -76,6 +76,6 @@ def import_config_pck(mlist, config_dict): value = converter(value) try: setattr(mlist, key, value) - except TypeError as error: + except TypeError: print >> sys.stderr, 'Type conversion error:', key raise diff --git a/src/mailman/utilities/modules.py b/src/mailman/utilities/modules.py index 024c8172e..54f379c3a 100644 --- a/src/mailman/utilities/modules.py +++ b/src/mailman/utilities/modules.py @@ -21,7 +21,7 @@ from __future__ import absolute_import, unicode_literals __metaclass__ = type __all__ = [ - 'call_name' + 'call_name', 'find_name', ] |