------------------------------------------------------------
revno: 6562
committer: Barry Warsaw <[EMAIL PROTECTED]>
branch nick: 3.0
timestamp: Sat 2007-09-29 15:10:52 -0400
message:
Eradicate mm_cfg.py
removed:
Mailman/mm_cfg.py.dist.in
modified:
Mailman/Defaults.py
Mailman/Message.py
Mailman/configuration.py
=== removed file 'Mailman/mm_cfg.py.dist.in'
--- a/Mailman/mm_cfg.py.dist.in 2007-01-19 04:38:06 +0000
+++ b/Mailman/mm_cfg.py.dist.in 1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-# -*- python -*-
-
-# Copyright (C) 1998-2007,1999,2000,2001,2002 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
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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.
-
-"""This module contains your site-specific settings.
-
-From a brand new distribution it should be copied to mm_cfg.py. If you
-already have an mm_cfg.py, be careful to add in only the new settings you
-want. Mailman's installation procedure will never overwrite your mm_cfg.py
-file.
-
-The complete set of distributed defaults, with documentation, are in the file
-Defaults.py. In mm_cfg.py, override only those you want to change, after the
-
- from Defaults import *
-
-line (see below).
-
-Note that these are just default settings; many can be overridden via the
-administrator and user interfaces on a per-list or per-user basis.
-
-"""
-
-###############################################
-# Here's where we get the distributed defaults.
-
-from Defaults import *
-
-##################################################
-# Put YOUR site-specific settings below this line.
=== modified file 'Mailman/Defaults.py'
--- a/Mailman/Defaults.py 2007-09-29 15:09:14 +0000
+++ b/Mailman/Defaults.py 2007-09-29 19:10:52 +0000
@@ -89,14 +89,6 @@
# a human.
SITE_OWNER_ADDRESS = '[EMAIL PROTECTED]'
-# DEFAULT_HOST_NAME has been replaced with DEFAULT_EMAIL_HOST, however some
-# sites may have the former in their mm_cfg.py files. If so, we'll believe
-# that, otherwise we'll believe DEFAULT_EMAIL_HOST. Same for DEFAULT_URL.
-DEFAULT_HOST_NAME = None
-DEFAULT_URL = None
-
-HOME_PAGE = 'index.html'
-
# Normally when a site administrator authenticates to a web page with the site
# password, they get a cookie which authorizes them as the list admin. It
# makes me nervous to hand out site auth cookies because if this cookie is
@@ -1342,12 +1334,13 @@
# element being the description, as described in the catalogs, and second
# element is the language charset. I have chosen code from /usr/share/locale
# in my GNU/Linux. :-)
-# TK: Now the site admin can select languages for the installation from
-# those in the distribution tarball. We don't touch add_language() function
-# for backward compatibility in mm_cfg.py syntax. You may have to add your
-# own language in mm_cfg.py if it is not included in the distribution even
-# if you had put language files in source directory and configured by
-# `--with-languages' option.
+#
+# TK: Now the site admin can select languages for the installation from those
+# in the distribution tarball. We don't touch add_language() function for
+# backward compatibility. You may have to add your own language in your
+# mailman.cfg file, if it is not included in the distribution even if you had
+# put language files in source directory and configured by `--with-languages'
+# option.
def _(s):
return s
=== modified file 'Mailman/Message.py'
--- a/Mailman/Message.py 2007-09-29 18:55:25 +0000
+++ b/Mailman/Message.py 2007-09-29 19:10:52 +0000
@@ -98,13 +98,13 @@
header value found is returned. However the search order is
determined by the following:
- - If mm_cfg.USE_ENVELOPE_SENDER is true, then the search order is
+ - If config.USE_ENVELOPE_SENDER is true, then the search order is
Sender:, From:, unixfrom
- Otherwise, the search order is From:, Sender:, unixfrom
The optional argument use_envelope, if given overrides the
- mm_cfg.USE_ENVELOPE_SENDER setting. It should be set to either 0 or 1
+ config.USE_ENVELOPE_SENDER setting. It should be set to either 0 or 1
(don't use None since that indicates no-override).
unixfrom should never be empty. The return address is always
=== modified file 'Mailman/configuration.py'
--- a/Mailman/configuration.py 2007-09-29 18:55:25 +0000
+++ b/Mailman/configuration.py 2007-09-29 19:10:52 +0000
@@ -107,9 +107,9 @@
sys.exit(-1)
# Based on values possibly set in mailman.cfg, add additional qrunners.
if ns['USE_MAILDIR']:
- self.add_qrunner('maildir')
+ self.add_qrunner('.maildir.MaildirRunner')
if ns['USE_LMTP']:
- self.add_qrunner('lmtp')
+ self.add_qrunner('.lmtp.LMTPRunner')
# Pull out the defaults.
VAR_DIR = os.path.abspath(ns['VAR_DIR'])
# Now that we've loaded all the configuration files we're going to
--
https://code.launchpad.net/~mailman-coders/mailman/3.0
You are receiving this branch notification because you are subscribed to it.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/3.0/+subscription/mailman-checkins.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
