diff options
Diffstat (limited to 'src/mailman/mta')
| -rw-r--r-- | src/mailman/mta/deliver.py | 6 | ||||
| -rw-r--r-- | src/mailman/mta/postfix.py | 6 | ||||
| -rw-r--r-- | src/mailman/mta/verp.py | 3 |
3 files changed, 4 insertions, 11 deletions
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( |