summaryrefslogtreecommitdiff
path: root/Mailman/Cgi/admin.py
diff options
context:
space:
mode:
authorBarry Warsaw2007-08-01 16:11:08 -0400
committerBarry Warsaw2007-08-01 16:11:08 -0400
commitf8a6c46455a409125dcc0fcace7d7116898b0319 (patch)
tree4d1c942d92e4b63eb8f000e25477079c14bb5346 /Mailman/Cgi/admin.py
parentd72336c1e5932158f6e1f80e5ea9e90d264b7c52 (diff)
parent7a7826e112a1d3f1999cb7a11e6df98cfcb712c9 (diff)
downloadmailman-f8a6c46455a409125dcc0fcace7d7116898b0319.tar.gz
mailman-f8a6c46455a409125dcc0fcace7d7116898b0319.tar.zst
mailman-f8a6c46455a409125dcc0fcace7d7116898b0319.zip
Diffstat (limited to 'Mailman/Cgi/admin.py')
-rw-r--r--Mailman/Cgi/admin.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index cfca3a88e..069bb6b31 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -1287,16 +1287,13 @@ def change_options(mlist, category, subcat, cgidata, doc):
whence='admin mass sub')
except Errors.MMAlreadyAMember:
subscribe_errors.append((entry, _('Already a member')))
- except Errors.MMBadEmailError:
+ except Errors.InvalidEmailAddress:
if userdesc.address == '':
subscribe_errors.append((_('<blank line>'),
_('Bad/Invalid email address')))
else:
subscribe_errors.append((entry,
_('Bad/Invalid email address')))
- except Errors.MMHostileAddress:
- subscribe_errors.append(
- (entry, _('Hostile address (illegal characters)')))
except Errors.MembershipIsBanned, pattern:
subscribe_errors.append(
(entry, _('Banned address (matched %(pattern)s)')))