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.

7 files changed, 0 insertions, 7 deletions

diff --git a/mailman/queue/docs/archiver.txt b/mailman/queue/docs/archiver.txt
index 8c34e3537..98ead0aa7 100644
--- a/mailman/queue/docs/archiver.txt
+++ b/mailman/queue/docs/archiver.txt
@@ -5,7 +5,6 @@ Mailman can archive to any number of archivers that adhere to the IArchiver
 interface.  By default, there's a Pipermail archiver.
 
     >>> from mailman.app.lifecycle import create_list
-    >>> from mailman.configuration import config
     >>> mlist = create_list(u'test@example.com')
     >>> mlist.web_page_url = u'http://www.example.com/'
     >>> config.db.commit()
diff --git a/mailman/queue/docs/command.txt b/mailman/queue/docs/command.txt
index 470a632b7..ce4279fff 100644
--- a/mailman/queue/docs/command.txt
+++ b/mailman/queue/docs/command.txt
@@ -24,7 +24,6 @@ sender.  The command can be in the Subject header.
     ...
     ... """)
 
-    >>> from mailman.configuration import config
     >>> from mailman.inject import inject_message
     >>> inject_message(mlist, msg, qdir=config.CMDQUEUE_DIR)
     >>> from mailman.queue.command import CommandRunner
diff --git a/mailman/queue/docs/incoming.txt b/mailman/queue/docs/incoming.txt
index 997eac07e..6bb5ead15 100644
--- a/mailman/queue/docs/incoming.txt
+++ b/mailman/queue/docs/incoming.txt
@@ -48,7 +48,6 @@ The incoming queue runner runs until it is empty.
 
 And now the message is in the pipeline queue.
 
-    >>> from mailman.configuration import config
     >>> from mailman.queue import Switchboard
     >>> pipeline_queue = Switchboard(config.PIPELINEQUEUE_DIR)
     >>> len(pipeline_queue.files)
diff --git a/mailman/queue/docs/news.txt b/mailman/queue/docs/news.txt
index 0b89de2bc..3375b3d54 100644
--- a/mailman/queue/docs/news.txt
+++ b/mailman/queue/docs/news.txt
@@ -6,7 +6,6 @@ NNTP newsgroup.  One of the most important things this runner does is prepare
 the message for Usenet (yes, I know that NNTP is not Usenet, but this runner
 was originally written to gate to Usenet, which has its own rules).
 
-    >>> from mailman.configuration import config
     >>> from mailman.queue.news import prepare_message
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.linked_newsgroup = u'comp.lang.python'
diff --git a/mailman/queue/docs/outgoing.txt b/mailman/queue/docs/outgoing.txt
index edc806d47..9af554af7 100644
--- a/mailman/queue/docs/outgoing.txt
+++ b/mailman/queue/docs/outgoing.txt
@@ -43,7 +43,6 @@ Normally, messages would show up in the outgoing queue after the message has
 been processed by the rule set and pipeline.  But we can simulate that here by
 injecting a message directly into the outgoing queue.
 
-    >>> from mailman.configuration import config
     >>> msgdata = {}
     >>> handler = config.handlers['calculate-recipients']
     >>> handler.process(mlist, msg, msgdata)
diff --git a/mailman/queue/docs/runner.txt b/mailman/queue/docs/runner.txt
index a9e17370b..70bab6539 100644
--- a/mailman/queue/docs/runner.txt
+++ b/mailman/queue/docs/runner.txt
@@ -16,7 +16,6 @@ continuously in a loop until the .stop() method is called.
 
     >>> import os
     >>> from mailman.queue import Runner, Switchboard
-    >>> from mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
     >>> mlist.preferred_language = u'en'
 
diff --git a/mailman/queue/docs/switchboard.txt b/mailman/queue/docs/switchboard.txt
index 633bdabe6..7baee7b54 100644
--- a/mailman/queue/docs/switchboard.txt
+++ b/mailman/queue/docs/switchboard.txt
@@ -14,7 +14,6 @@ instance of a switchboard is responsible for one queue directory.
 Create a switchboard by giving its queue directory.
 
     >>> import os
-    >>> from mailman.configuration import config
     >>> queue_directory = os.path.join(config.QUEUE_DIR, 'test')
     >>> from mailman.queue import Switchboard
     >>> switchboard = Switchboard(queue_directory)