diff options
Diffstat (limited to '')
| -rw-r--r-- | mailman/app/moderator.py | 4 | ||||
| -rw-r--r-- | mailman/app/notifications.py | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/mailman/app/moderator.py b/mailman/app/moderator.py index a678f3734..377bbb175 100644 --- a/mailman/app/moderator.py +++ b/mailman/app/moderator.py @@ -41,7 +41,6 @@ from mailman.config import config from mailman.core import errors from mailman.interfaces import Action, DeliveryMode, RequestType from mailman.interfaces.member import AlreadySubscribedError -from mailman.queue import Switchboard _ = i18n._ @@ -141,8 +140,7 @@ def handle_message(mlist, id, action, msg.get('message-id', 'n/a')) # Stick the message back in the incoming queue for further # processing. - inq = Switchboard(config.INQUEUE_DIR) - inq.enqueue(msg, _metadata=msgdata) + config.switchboards['in'].enqueue(msg, _metadata=msgdata) else: raise AssertionError('Unexpected action: %s' % action) # Forward the message. diff --git a/mailman/app/notifications.py b/mailman/app/notifications.py index d3546ee83..c2f507e2c 100644 --- a/mailman/app/notifications.py +++ b/mailman/app/notifications.py @@ -27,10 +27,10 @@ __all__ = [ from email.utils import formataddr +from mailman import Defaults from mailman import Message from mailman import Utils from mailman import i18n -from mailman.config import config from mailman.interfaces.member import DeliveryMode _ = i18n._ @@ -79,7 +79,7 @@ def send_welcome_message(mlist, address, language, delivery_mode, text=''): _('Welcome to the "$mlist.real_name" mailing list${digmode}'), text, language) msg['X-No-Archive'] = 'yes' - msg.send(mlist, verp=config.VERP_PERSONALIZED_DELIVERIES) + msg.send(mlist, verp=Defaults.VERP_PERSONALIZED_DELIVERIES) @@ -104,7 +104,7 @@ def send_goodbye_message(mlist, address, language): address, mlist.bounces_address, _('You have been unsubscribed from the $mlist.real_name mailing list'), goodbye, language) - msg.send(mlist, verp=config.VERP_PERSONALIZED_DELIVERIES) + msg.send(mlist, verp=Defaults.VERP_PERSONALIZED_DELIVERIES) |