Convert more configuration variables to lazr.config.

Add .push() and .pop() methods to the Configuration object.

Put the 'config' object in the globals of doctests.

Add some test layers for setting up the configuration and the SMTP server.

14 files changed, 0 insertions, 14 deletions

diff --git a/mailman/rules/docs/administrivia.txt b/mailman/rules/docs/administrivia.txt
index 65742fba2..df6685074 100644
--- a/mailman/rules/docs/administrivia.txt
+++ b/mailman/rules/docs/administrivia.txt
@@ -6,7 +6,6 @@ commands in the Subject header or first few lines of the payload.  This is
 used to catch messages posted to the list which should have been sent to the
 -request robot address.
 
-    >>> from mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.administrivia = True
     >>> rule = config.rules['administrivia']
diff --git a/mailman/rules/docs/approve.txt b/mailman/rules/docs/approve.txt
index 3b5065849..cb3093e0d 100644
--- a/mailman/rules/docs/approve.txt
+++ b/mailman/rules/docs/approve.txt
@@ -13,7 +13,6 @@ approval queue.  This has several use cases:
 In order to support this, a mailing list can be given a 'moderator password'
 which is shared among all the administrators.
 
-    >>> from mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.moderator_password = u'abcxyz'
 
diff --git a/mailman/rules/docs/emergency.txt b/mailman/rules/docs/emergency.txt
index 6437ba626..0f1005410 100644
--- a/mailman/rules/docs/emergency.txt
+++ b/mailman/rules/docs/emergency.txt
@@ -27,7 +27,6 @@ There are two messages in the virgin queue.  The one addressed to the original
 sender will contain a token we can use to grab the held message out of the
 pending requests.
 
-    >>> from mailman.configuration import config
     >>> from mailman.queue import Switchboard
     >>> virginq = Switchboard(config.VIRGINQUEUE_DIR)
 
diff --git a/mailman/rules/docs/header-matching.txt b/mailman/rules/docs/header-matching.txt
index 0dd917a71..5e8d01ead 100644
--- a/mailman/rules/docs/header-matching.txt
+++ b/mailman/rules/docs/header-matching.txt
@@ -12,7 +12,6 @@ Because the default HEADER_MATCHES variable is empty when the configuration
 file is read, we'll just extend the current header matching chain with a
 pattern that matches 4 or more stars, discarding the message if it hits.
 
-    >>> from mailman.configuration import config
     >>> chain = config.chains['header-match']
     >>> chain.extend('x-spam-score', '[*]{4,}', 'discard')
 
diff --git a/mailman/rules/docs/implicit-dest.txt b/mailman/rules/docs/implicit-dest.txt
index 8857a397e..30db86611 100644
--- a/mailman/rules/docs/implicit-dest.txt
+++ b/mailman/rules/docs/implicit-dest.txt
@@ -4,7 +4,6 @@ Implicit destination
 The 'implicit-dest' rule matches when the mailing list's posting address is
 not explicitly mentioned in the set of message recipients.
 
-    >>> from mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> rule = config.rules['implicit-dest']
     >>> rule.name
diff --git a/mailman/rules/docs/loop.txt b/mailman/rules/docs/loop.txt
index ba3cbbc1d..6391864b2 100644
--- a/mailman/rules/docs/loop.txt
+++ b/mailman/rules/docs/loop.txt
@@ -4,7 +4,6 @@ Posting loops
 To avoid a posting loop, Mailman has a rule to check for the existence of an
 X-BeenThere header with the value of the list's posting address.
 
-    >>> from mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> rule = config.rules['loop']
     >>> rule.name
diff --git a/mailman/rules/docs/max-size.txt b/mailman/rules/docs/max-size.txt
index 7ece6a54a..ae7921f9c 100644
--- a/mailman/rules/docs/max-size.txt
+++ b/mailman/rules/docs/max-size.txt
@@ -6,7 +6,6 @@ specified maximum.  Generally this is used to prevent huge attachments from
 getting posted to the list.  This value is calculated in terms of KB (1024
 bytes).
 
-    >>> from mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> rule = config.rules['max-size']
     >>> rule.name
diff --git a/mailman/rules/docs/moderation.txt b/mailman/rules/docs/moderation.txt
index 3af5f2520..9f3663517 100644
--- a/mailman/rules/docs/moderation.txt
+++ b/mailman/rules/docs/moderation.txt
@@ -6,7 +6,6 @@ postings, then only members with a cleared moderation flag will be able to
 email the list without having those messages be held for approval.  The
 'moderation' rule determines whether the message should be moderated or not.
 
-    >>> from mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> rule = config.rules['moderation']
     >>> rule.name
diff --git a/mailman/rules/docs/news-moderation.txt b/mailman/rules/docs/news-moderation.txt
index 1ecbe12cf..36310797c 100644
--- a/mailman/rules/docs/news-moderation.txt
+++ b/mailman/rules/docs/news-moderation.txt
@@ -8,7 +8,6 @@ posted to the newsgroup, and from there, gated to the mailing list.  It's a
 circuitous route, but it works nonetheless by holding all messages posted
 directly to the mailing list.
 
-    >>> from mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> rule = config.rules['news-moderation']
     >>> rule.name
diff --git a/mailman/rules/docs/no-subject.txt b/mailman/rules/docs/no-subject.txt
index 0a67ccbef..4fa001308 100644
--- a/mailman/rules/docs/no-subject.txt
+++ b/mailman/rules/docs/no-subject.txt
@@ -4,7 +4,6 @@ No Subject header
 This rule matches if the message has no Subject header, or if the header is
 the empty string when stripped.
 
-    >>> from mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> rule = config.rules['no-subject']
     >>> rule.name
diff --git a/mailman/rules/docs/recipients.txt b/mailman/rules/docs/recipients.txt
index 3408e7e51..b364dd031 100644
--- a/mailman/rules/docs/recipients.txt
+++ b/mailman/rules/docs/recipients.txt
@@ -4,7 +4,6 @@ Maximum number of recipients
 The 'max-recipients' rule matches when there are more than the maximum allowed
 number of explicit recipients addressed by the message.
 
-    >>> from mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> rule = config.rules['max-recipients']
     >>> rule.name
diff --git a/mailman/rules/docs/rules.txt b/mailman/rules/docs/rules.txt
index fff833462..bae9f594a 100644
--- a/mailman/rules/docs/rules.txt
+++ b/mailman/rules/docs/rules.txt
@@ -13,7 +13,6 @@ Rules are maintained in the configuration object as a dictionary mapping rule
 names to rule objects.
 
     >>> from zope.interface.verify import verifyObject
-    >>> from mailman.configuration import config
     >>> from mailman.interfaces import IRule
     >>> for rule_name in sorted(config.rules):
     ...     rule = config.rules[rule_name]
diff --git a/mailman/rules/docs/suspicious.txt b/mailman/rules/docs/suspicious.txt
index df2bc64af..0cc515ae4 100644
--- a/mailman/rules/docs/suspicious.txt
+++ b/mailman/rules/docs/suspicious.txt
@@ -5,7 +5,6 @@ Suspicious headers are a way for Mailman to hold messages that match a
 particular regular expression.  This mostly historical feature is fairly
 confusing to users, and the list attribute that controls this is misnamed.
 
-    >>> from mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> rule = config.rules['suspicious-header']
     >>> rule.name
diff --git a/mailman/rules/docs/truth.txt b/mailman/rules/docs/truth.txt
index 3c11e4954..f331e852b 100644
--- a/mailman/rules/docs/truth.txt
+++ b/mailman/rules/docs/truth.txt
@@ -4,7 +4,6 @@ Truth
 The 'truth' rule always matches.  This makes it useful as a terminus rule for
 unconditionally jumping to another chain.
 
-    >>> from mailman.configuration import config
     >>> rule = config.rules['truth']
     >>> rule.check(False, False, False)
     True