Added a buildout hack for zope.testing so that we can add our own command line

options to bin/test.

More test repair, even though it's cheating.  Use a bunch of variables from
Defaults.py even though these will have to be moved to the schema.cfg.

Update logging initialization to consult the propagate flag from the command
line.  Also skip mailman.root since this is not a valid logger.

1 files changed, 5 insertions, 4 deletions

diff --git a/mailman/Mailbox.py b/mailman/Mailbox.py
index cbc38585a..bb4982fc6 100644
--- a/mailman/Mailbox.py
+++ b/mailman/Mailbox.py
@@ -26,8 +26,8 @@ from email.Errors import MessageParseError
 from email.Generator import Generator
 from email.Parser import Parser
 
+from mailman import Defaults
 from mailman.Message import Message
-from mailman.config import config
 
 
 
@@ -91,9 +91,10 @@ class ArchiverMailbox(Mailbox):
     # scrub() method, giving the scrubber module a chance to do its thing
     # before the message is archived.
     def __init__(self, fp, mlist):
-        if config.ARCHIVE_SCRUBBER:
-            __import__(config.ARCHIVE_SCRUBBER)
-            self._scrubber = sys.modules[config.ARCHIVE_SCRUBBER].process
+        scrubber_module = Defaults.ARCHIVE_SCRUBBER
+        if scrubber_module:
+            __import__(scrubber_module)
+            self._scrubber = sys.modules[scrubber_module].process
         else:
             self._scrubber = None
         self._mlist = mlist