summaryrefslogtreecommitdiff
path: root/mailman/app/moderator.py
diff options
context:
space:
mode:
authorBarry Warsaw2009-01-01 17:58:39 -0500
committerBarry Warsaw2009-01-01 17:58:39 -0500
commit1c285f110d8e98597453c6b4b69ea01163033547 (patch)
tree00c7ec16711b2073e40f593658f652726a9d4231 /mailman/app/moderator.py
parent12513c7d0fc1f5d2a1aabda349637309f6e8300b (diff)
parent600ddb503a391d70230d96ee91a631888d11b35a (diff)
downloadmailman-1c285f110d8e98597453c6b4b69ea01163033547.tar.gz
mailman-1c285f110d8e98597453c6b4b69ea01163033547.tar.zst
mailman-1c285f110d8e98597453c6b4b69ea01163033547.zip
Two major structural conversions.
* Use zc.buildout and zc.testing frameworks for building and testing Mailman. * Use lazr.config as the configuration system, though this conversion is not yet complete. Also: move a bunch of old bin scripts to the attic.
Diffstat (limited to 'mailman/app/moderator.py')
-rw-r--r--mailman/app/moderator.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/mailman/app/moderator.py b/mailman/app/moderator.py
index 9cce5aa8a..e5d37e80f 100644
--- a/mailman/app/moderator.py
+++ b/mailman/app/moderator.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2007-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
@@ -37,11 +37,10 @@ from mailman import i18n
from mailman.app.membership import add_member, delete_member
from mailman.app.notifications import (
send_admin_subscription_notice, send_welcome_message)
-from mailman.configuration import config
+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.