Massive conversion process so that Mailman can be run from a user specified

configuration file.  While the full conversion is not yet complete, everything
that seems to be required to run mailmanctl, qrunner, rmlist, and newlist have
been updated.

Basically, modules should no longer import mm_cfg, but instead they should
import Mailman.configuration.config.  The latter is an object that's
guaranteed to exist, but not guaranteed to be initialized until some top-level
script calls config.load().  The latter should be called with the argument to
-C/--config which is a new convention the above scripts have been given.

In most cases, where mm_cfg.<variable> is used config.<variable> can be used,
but the exceptions are where the default value must be available before
config.load() is called.  Sometimes you can import Mailman.Default and get the
variable from there, but other times the code has to be changed to work around
this limitation.  Take each on a case-by-case basis.

Note that the various directories calculated from VAR_PREFIX, EXEC_PREFIX, and
PREFIX are now calculated in config.py, not in Defaults.py.  This way a
configuration file can override the base directories and everything should
work correctly.

Other changes here include:

- mailmanctl, qrunner, and update are switched to optparse and $-strings, and
  changed to the mmshell architecture
- An etc directory has been added to /usr/local/mailman and a
  mailman.cfg.sample file is installed there.  Sites should now edit an
  etc/mailman.cfg file to do their configurations, although the mm_cfg file is
  still honored.  The formats of the two files are identical.
- list_lists is given the -C/--config option
- Some coding style fixes in bin/update, but not extensive
- Get rid of nested scope hacks in qrunner.py
- A start on getting EmailBase tests working (specifically test_message),
  although not yet complete.

1 files changed, 5 insertions, 5 deletions

diff --git a/Mailman/Message.py b/Mailman/Message.py
index 7216d7c9a..b39bcb3fe 100644
--- a/Mailman/Message.py
+++ b/Mailman/Message.py
@@ -29,8 +29,8 @@ import email.Utils
 from email.Charset import Charset
 from email.Header import Header
 
-from Mailman import mm_cfg
 from Mailman import Utils
+from Mailman.configuration import config
 
 COMMASPACE = ', '
 
@@ -113,7 +113,7 @@ class Message(email.Message.Message):
         This method differs from get_senders() in that it returns one and only
         one address, and uses a different search order.
         """
-        senderfirst = mm_cfg.USE_ENVELOPE_SENDER
+        senderfirst = config.USE_ENVELOPE_SENDER
         if use_envelope is not None:
             senderfirst = use_envelope
         if senderfirst:
@@ -165,7 +165,7 @@ class Message(email.Message.Message):
         names without the trailing colon.
         """
         if headers is None:
-            headers = mm_cfg.SENDER_HEADERS
+            headers = config.SENDER_HEADERS
         pairs = []
         for h in headers:
             if h is None:
@@ -245,7 +245,7 @@ class UserNotification(Message):
     def _enqueue(self, mlist, **_kws):
         # Not imported at module scope to avoid import loop
         from Mailman.Queue.sbcache import get_switchboard
-        virginq = get_switchboard(mm_cfg.VIRGINQUEUE_DIR)
+        virginq = get_switchboard(config.VIRGINQUEUE_DIR)
         # The message metadata better have a `recip' attribute
         virginq.enqueue(self,
                         listname = mlist.internal_name(),
@@ -276,7 +276,7 @@ class OwnerNotification(UserNotification):
     def _enqueue(self, mlist, **_kws):
         # Not imported at module scope to avoid import loop
         from Mailman.Queue.sbcache import get_switchboard
-        virginq = get_switchboard(mm_cfg.VIRGINQUEUE_DIR)
+        virginq = get_switchboard(config.VIRGINQUEUE_DIR)
         # The message metadata better have a `recip' attribute
         virginq.enqueue(self,
                         listname = mlist.internal_name(),