4 files changed, 3 insertions, 6 deletions

diff --git a/mailman/commands/docs/echo.txt b/mailman/commands/docs/echo.txt
index d2781d330..181cc58c8 100644
--- a/mailman/commands/docs/echo.txt
+++ b/mailman/commands/docs/echo.txt
@@ -4,7 +4,6 @@ The 'echo' command
 The mail command 'echo' simply replies with the original command and arguments
 to the sender.
 
-    >>> from mailman.configuration import config
     >>> command = config.commands['echo']
     >>> command.name
     'echo'
diff --git a/mailman/commands/docs/end.txt b/mailman/commands/docs/end.txt
index bd632de48..4f6af26cb 100644
--- a/mailman/commands/docs/end.txt
+++ b/mailman/commands/docs/end.txt
@@ -4,7 +4,6 @@ The 'end' command
 The mail command processor recognized an 'end' command which tells it to stop
 processing email messages.
 
-    >>> from mailman.configuration import config
     >>> command = config.commands['end']
     >>> command.name
     'end'
diff --git a/mailman/commands/docs/join.txt b/mailman/commands/docs/join.txt
index 492297787..fd382d0f0 100644
--- a/mailman/commands/docs/join.txt
+++ b/mailman/commands/docs/join.txt
@@ -4,7 +4,6 @@ The 'join' command
 The mail command 'join' subscribes an email address to the mailing list.
 'subscribe' is an alias for 'join'.
 
-    >>> from mailman.configuration import config
     >>> command = config.commands['join']
     >>> print command.name
     join
@@ -84,8 +83,7 @@ first.
 
 Mailman has sent her the confirmation message.
 
-    >>> from mailman.queue import Switchboard
-    >>> virginq = Switchboard(config.VIRGINQUEUE_DIR)
+    >>> virginq = config.switchboards['virgin']
     >>> qmsg, qdata = virginq.dequeue(virginq.files[0])
     >>> print qmsg.as_string()
     MIME-Version: 1.0
diff --git a/mailman/database/pending.py b/mailman/database/pending.py
index bdfd9cc72..d3e9d598e 100644
--- a/mailman/database/pending.py
+++ b/mailman/database/pending.py
@@ -27,6 +27,7 @@ from storm.locals import *
 from zope.interface import implements
 from zope.interface.verify import verifyObject
 
+from mailman import Defaults
 from mailman.config import config
 from mailman.database.model import Model
 from mailman.interfaces import (
@@ -79,7 +80,7 @@ class Pendings(object):
         verifyObject(IPendable, pendable)
         # Calculate the token and the lifetime.
         if lifetime is None:
-            lifetime = config.PENDING_REQUEST_LIFE
+            lifetime = Defaults.PENDING_REQUEST_LIFE
         # Calculate a unique token.  Algorithm vetted by the Timbot.  time()
         # has high resolution on Linux, clock() on Windows.  random gives us
         # about 45 bits in Python 2.2, 53 bits on Python 2.3.  The time and