diff options
Diffstat (limited to 'mailman/app')
| -rw-r--r-- | mailman/app/lifecycle.py | 15 | ||||
| -rw-r--r-- | mailman/app/membership.py | 4 | ||||
| -rw-r--r-- | mailman/app/moderator.py | 4 |
3 files changed, 13 insertions, 10 deletions
diff --git a/mailman/app/lifecycle.py b/mailman/app/lifecycle.py index 7095c0f9a..363ade2c4 100644 --- a/mailman/app/lifecycle.py +++ b/mailman/app/lifecycle.py @@ -17,23 +17,26 @@ """Application level list creation.""" +__metaclass__ = type +__all__ = [ + 'create_list', + 'remove_list', + ] + + import os import sys import shutil import logging -from mailman import Errors from mailman import Utils from mailman.Utils import ValidateEmail from mailman.app.plugins import get_plugin from mailman.app.styles import style_manager from mailman.configuration import config +from mailman.core import errors from mailman.interfaces import MemberRole -__all__ = [ - 'create_list', - 'remove_list', - ] log = logging.getLogger('mailman.error') @@ -47,7 +50,7 @@ def create_list(fqdn_listname, owners=None): ValidateEmail(fqdn_listname) listname, domain = Utils.split_listname(fqdn_listname) if domain not in config.domains: - raise Errors.BadDomainSpecificationError(domain) + raise errors.BadDomainSpecificationError(domain) mlist = config.db.list_manager.create(fqdn_listname) for style in style_manager.lookup(mlist): # XXX FIXME. When we get rid of the wrapper object, this hack won't diff --git a/mailman/app/membership.py b/mailman/app/membership.py index 481e55a4e..775c5cf59 100644 --- a/mailman/app/membership.py +++ b/mailman/app/membership.py @@ -28,12 +28,12 @@ __all__ = [ from email.utils import formataddr -from mailman import Errors from mailman import Message from mailman import Utils from mailman import i18n from mailman.app.notifications import send_goodbye_message from mailman.configuration import config +from mailman.core import errors from mailman.interfaces import AlreadySubscribedError, DeliveryMode, MemberRole _ = i18n._ @@ -68,7 +68,7 @@ def add_member(mlist, address, realname, password, delivery_mode, language): # confirmations. pattern = Utils.get_pattern(address, mlist.ban_list) if pattern: - raise Errors.MembershipIsBanned(pattern) + raise errors.MembershipIsBanned(pattern) # Do the actual addition. First, see if there's already a user linked # with the given address. user = config.db.user_manager.get_user(address) diff --git a/mailman/app/moderator.py b/mailman/app/moderator.py index 2483d933e..7ef454c03 100644 --- a/mailman/app/moderator.py +++ b/mailman/app/moderator.py @@ -33,7 +33,6 @@ import logging from datetime import datetime from email.utils import formataddr, formatdate, getaddresses, make_msgid -from mailman import Errors from mailman import Message from mailman import Utils from mailman import i18n @@ -41,6 +40,7 @@ from mailman.app.membership import add_member, delete_member from mailman.app.notifications import ( send_admin_subscription_notice, send_welcome_message) from mailman.configuration import config +from mailman.core import errors from mailman.interfaces import Action, DeliveryMode, RequestType from mailman.interfaces.member import AlreadySubscribedError from mailman.queue import Switchboard @@ -310,7 +310,7 @@ def handle_unsubscription(mlist, id, action, comment=None): key, data = requestdb.get_request(id) try: delete_member(mlist, address) - except Errors.NotAMemberError: + except errors.NotAMemberError: # User has already been unsubscribed. pass slog.info('%s: deleted %s', mlist.fqdn_listname, address) |