summaryrefslogtreecommitdiff
path: root/mailman/chains
diff options
context:
space:
mode:
authorBarry Warsaw2008-12-20 15:41:16 -0500
committerBarry Warsaw2008-12-20 15:41:16 -0500
commitdfccf2b7d2b5749c86267645aaf870f128dab2d8 (patch)
tree205cc5253b2b5462e9e5409b09b0a7cea7f30a7b /mailman/chains
parent33a924c56669b12e268bce5df68f598b690cdcf0 (diff)
downloadmailman-dfccf2b7d2b5749c86267645aaf870f128dab2d8.tar.gz
mailman-dfccf2b7d2b5749c86267645aaf870f128dab2d8.tar.zst
mailman-dfccf2b7d2b5749c86267645aaf870f128dab2d8.zip
Lots of changes to make bin/withlist work under a buildout environment.
mailman.configuration -> mailman.config.config mailman.initialize -> mailma.core.initialize mailman.loginit -> mailman.core.logging (yay future absolute imports!) Convert all configurations to lazr.config, though some legacy still remains, and I haven't been able to remove Defaults.py yet. Added as_boolean() and as_log_level() helpers for explicit type conversion. Added a schema.cfg.
Diffstat (limited to 'mailman/chains')
-rw-r--r--mailman/chains/accept.py2
-rw-r--r--mailman/chains/base.py2
-rw-r--r--mailman/chains/builtin.py2
-rw-r--r--mailman/chains/headers.py4
-rw-r--r--mailman/chains/hold.py2
5 files changed, 6 insertions, 6 deletions
diff --git a/mailman/chains/accept.py b/mailman/chains/accept.py
index a4f02b217..0ced02d44 100644
--- a/mailman/chains/accept.py
+++ b/mailman/chains/accept.py
@@ -23,7 +23,7 @@ __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
diff --git a/mailman/chains/base.py b/mailman/chains/base.py
index 39968a1fe..17c129f19 100644
--- a/mailman/chains/base.py
+++ b/mailman/chains/base.py
@@ -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..0528bf769 100644
--- a/mailman/chains/builtin.py
+++ b/mailman/chains/builtin.py
@@ -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/headers.py b/mailman/chains/headers.py
index d53f67e06..062c42438 100644
--- a/mailman/chains/headers.py
+++ b/mailman/chains/headers.py
@@ -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..1b44cee1b 100644
--- a/mailman/chains/hold.py
+++ b/mailman/chains/hold.py
@@ -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