Merge the setuptools branch. Fix a couple of test modules that are

disabled anyway.

1 files changed, 4 insertions, 4 deletions

diff --git a/Mailman/Mailbox.py b/Mailman/Mailbox.py
index 12eea2bdb..9b3474c2b 100644
--- a/Mailman/Mailbox.py
+++ b/Mailman/Mailbox.py
@@ -25,8 +25,8 @@ from email.Errors import MessageParseError
 from email.Generator import Generator
 from email.Parser import Parser
 
-from Mailman import mm_cfg
 from Mailman.Message import Message
+from Mailman.configuration import config
 
 
 
@@ -90,9 +90,9 @@ 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 mm_cfg.ARCHIVE_SCRUBBER:
-            __import__(mm_cfg.ARCHIVE_SCRUBBER)
-            self._scrubber = sys.modules[mm_cfg.ARCHIVE_SCRUBBER].process
+        if config.ARCHIVE_SCRUBBER:
+            __import__(config.ARCHIVE_SCRUBBER)
+            self._scrubber = sys.modules[config.ARCHIVE_SCRUBBER].process
         else:
             self._scrubber = None
         self._mlist = mlist