diff options
Diffstat (limited to 'mailman/database/mailinglist.py')
| -rw-r--r-- | mailman/database/mailinglist.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mailman/database/mailinglist.py b/mailman/database/mailinglist.py index d5e6fd7b8..641245daf 100644 --- a/mailman/database/mailinglist.py +++ b/mailman/database/mailinglist.py @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2008 by the Free Software Foundation, Inc. +# Copyright (C) 2006-2009 by the Free Software Foundation, Inc. # # This file is part of GNU Mailman. # @@ -21,8 +21,9 @@ import string from storm.locals import * from zope.interface import implements +from mailman import Defaults from mailman.Utils import fqdn_listname, makedirs, split_listname -from mailman.configuration import config +from mailman.config import config from mailman.database import roster from mailman.database.model import Model from mailman.database.types import Enum @@ -218,7 +219,7 @@ class MailingList(Model): @property def no_reply_address(self): - return '%s@%s' % (config.NO_REPLY_ADDRESS, self.host_name) + return '%s@%s' % (config.mailman.noreply_address, self.host_name) @property def owner_address(self): @@ -249,7 +250,7 @@ class MailingList(Model): return '%s-unsubscribe@%s' % (self.list_name, self.host_name) def confirm_address(self, cookie): - template = string.Template(config.VERP_CONFIRM_FORMAT) + template = string.Template(Defaults.VERP_CONFIRM_FORMAT) local_part = template.safe_substitute( address = '%s-confirm' % self.list_name, cookie = cookie) |