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, 9 insertions, 8 deletions

diff --git a/Mailman/Queue/ArchRunner.py b/Mailman/Queue/ArchRunner.py
index 627145372..f3c90f5c3 100644
--- a/Mailman/Queue/ArchRunner.py
+++ b/Mailman/Queue/ArchRunner.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2000-2006 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -12,21 +12,22 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
 
 """Archive queue runner."""
 
 import time
 from email.Utils import parsedate_tz, mktime_tz, formatdate
 
-from Mailman import mm_cfg
 from Mailman import LockFile
 from Mailman.Queue.Runner import Runner
+from Mailman.configuration import config
 
 
 
 class ArchRunner(Runner):
-    QDIR = mm_cfg.ARCHQUEUE_DIR
+    QDIR = config.ARCHQUEUE_DIR
 
     def _dispose(self, mlist, msg, msgdata):
         # Support clobber_date, i.e. setting the date in the archive to the
@@ -37,9 +38,9 @@ class ArchRunner(Runner):
         receivedtime = formatdate(msgdata['received_time'])
         if not originaldate:
             clobber = 1
-        elif mm_cfg.ARCHIVER_CLOBBER_DATE_POLICY == 1:
+        elif config.ARCHIVER_CLOBBER_DATE_POLICY == 1:
             clobber = 1
-        elif mm_cfg.ARCHIVER_CLOBBER_DATE_POLICY == 2:
+        elif config.ARCHIVER_CLOBBER_DATE_POLICY == 2:
             # what's the timestamp on the original message?
             tup = parsedate_tz(originaldate)
             now = time.time()
@@ -47,7 +48,7 @@ class ArchRunner(Runner):
                 if not tup:
                     clobber = 1
                 elif abs(now - mktime_tz(tup)) > \
-                         mm_cfg.ARCHIVER_ALLOWABLE_SANE_DATE_SKEW:
+                         config.ARCHIVER_ALLOWABLE_SANE_DATE_SKEW:
                     clobber = 1
             except (ValueError, OverflowError):
                 # The likely cause of this is that the year in the Date: field
@@ -65,7 +66,7 @@ class ArchRunner(Runner):
         msg['X-List-Received-Date'] = receivedtime
         # Now try to get the list lock
         try:
-            mlist.Lock(timeout=mm_cfg.LIST_LOCK_TIMEOUT)
+            mlist.Lock(timeout=config.LIST_LOCK_TIMEOUT)
         except LockFile.TimeOutError:
             # oh well, try again later
             return 1