summaryrefslogtreecommitdiff
path: root/mailman/chains
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/chains
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/chains')
-rw-r--r--mailman/chains/accept.py7
-rw-r--r--mailman/chains/base.py4
-rw-r--r--mailman/chains/builtin.py4
-rw-r--r--mailman/chains/discard.py2
-rw-r--r--mailman/chains/headers.py6
-rw-r--r--mailman/chains/hold.py4
-rw-r--r--mailman/chains/reject.py2
7 files changed, 14 insertions, 15 deletions
diff --git a/mailman/chains/accept.py b/mailman/chains/accept.py
index a4f02b217..d0c570c69 100644
--- a/mailman/chains/accept.py
+++ b/mailman/chains/accept.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.
#
@@ -23,9 +23,8 @@ __metaclass__ = type
import logging
from mailman.chains.base import TerminalChainBase
-from mailman.configuration import config
+from mailman.config import config
from mailman.i18n import _
-from mailman.queue import Switchboard
log = logging.getLogger('mailman.vette')
@@ -50,6 +49,6 @@ class AcceptChain(TerminalChainBase):
rule_misses = msgdata.get('rule_misses')
if rule_misses:
msg['X-Mailman-Rule-Misses'] = SEMISPACE.join(rule_misses)
- accept_queue = Switchboard(config.PIPELINEQUEUE_DIR)
+ accept_queue = config.switchboards['pipeline']
accept_queue.enqueue(msg, msgdata)
log.info('ACCEPT: %s', msg.get('message-id', 'n/a'))
diff --git a/mailman/chains/base.py b/mailman/chains/base.py
index 39968a1fe..c9edcba44 100644
--- a/mailman/chains/base.py
+++ b/mailman/chains/base.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2008 by the Free Software Foundation, Inc.
+# Copyright (C) 2008-2009 by the Free Software Foundation, Inc.
#
# This file is part of GNU Mailman.
#
@@ -27,7 +27,7 @@ __all__ = [
from zope.interface import implements
-from mailman.configuration import config
+from mailman.config import config
from mailman.interfaces import (
IChain, IChainIterator, IChainLink, IMutableChain, LinkAction)
diff --git a/mailman/chains/builtin.py b/mailman/chains/builtin.py
index 238cf4099..8f460ba09 100644
--- a/mailman/chains/builtin.py
+++ b/mailman/chains/builtin.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.
#
@@ -26,7 +26,7 @@ import logging
from zope.interface import implements
from mailman.chains.base import Link
-from mailman.configuration import config
+from mailman.config import config
from mailman.i18n import _
from mailman.interfaces import IChain, LinkAction
diff --git a/mailman/chains/discard.py b/mailman/chains/discard.py
index 166aed908..525505e36 100644
--- a/mailman/chains/discard.py
+++ b/mailman/chains/discard.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.
#
diff --git a/mailman/chains/headers.py b/mailman/chains/headers.py
index d53f67e06..311e5feee 100644
--- a/mailman/chains/headers.py
+++ b/mailman/chains/headers.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.
#
@@ -30,7 +30,7 @@ from zope.interface import implements
from mailman.interfaces import IChainIterator, IRule, LinkAction
from mailman.chains.base import Chain, Link
from mailman.i18n import _
-from mailman.configuration import config
+from mailman.config import config
log = logging.getLogger('mailman.vette')
@@ -104,7 +104,7 @@ class HeaderMatchChain(Chain):
self._links = []
# Initialize header check rules with those from the global
# HEADER_MATCHES variable.
- for entry in config.HEADER_MATCHES:
+ for entry in config.header_matches:
self._links.append(make_link(entry))
# Keep track of how many global header matching rules we've seen.
# This is so the flush() method will only delete those that were added
diff --git a/mailman/chains/hold.py b/mailman/chains/hold.py
index 85e8c3fec..655771fcb 100644
--- a/mailman/chains/hold.py
+++ b/mailman/chains/hold.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.
#
@@ -36,7 +36,7 @@ from mailman.Utils import maketext, oneline, wrap, GetCharSet
from mailman.app.moderator import hold_message
from mailman.app.replybot import autorespond_to_sender, can_acknowledge
from mailman.chains.base import TerminalChainBase
-from mailman.configuration import config
+from mailman.config import config
from mailman.interfaces import IPendable
diff --git a/mailman/chains/reject.py b/mailman/chains/reject.py
index 34e72fa86..c7ec04fec 100644
--- a/mailman/chains/reject.py
+++ b/mailman/chains/reject.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.
#