From 2c7c9314d5ff8224273ac62d1096c9aa121bc8e0 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Tue, 15 Apr 2014 10:03:39 -0400 Subject: Remove a few redundant checks. --- src/mailman/app/membership.py | 3 --- src/mailman/app/subscriptions.py | 5 ----- 2 files changed, 8 deletions(-) (limited to 'src') diff --git a/src/mailman/app/membership.py b/src/mailman/app/membership.py index fdeb6e9c4..4ec6b7878 100644 --- a/src/mailman/app/membership.py +++ b/src/mailman/app/membership.py @@ -35,7 +35,6 @@ from mailman.app.notifications import ( from mailman.config import config from mailman.core.i18n import _ from mailman.email.message import OwnerNotification -from mailman.interfaces.address import IEmailValidator from mailman.interfaces.bans import IBanManager from mailman.interfaces.member import ( MemberRole, MembershipIsBannedError, NotAMemberError, SubscriptionEvent) @@ -72,8 +71,6 @@ def add_member(mlist, email, display_name, password, delivery_mode, language, :raises InvalidEmailAddressError: if the email address is not valid. :raises MembershipIsBannedError: if the membership is not allowed. """ - # Let's be extra cautious. - getUtility(IEmailValidator).validate(email) # Check to see if the email address is banned. if IBanManager(mlist).is_banned(email): raise MembershipIsBannedError(mlist, email) diff --git a/src/mailman/app/subscriptions.py b/src/mailman/app/subscriptions.py index d80069ba5..b2560beb5 100644 --- a/src/mailman/app/subscriptions.py +++ b/src/mailman/app/subscriptions.py @@ -37,7 +37,6 @@ from mailman.app.membership import add_member, delete_member from mailman.config import config from mailman.core.constants import system_preferences from mailman.database.transaction import dbconnection -from mailman.interfaces.address import IEmailValidator from mailman.interfaces.listmanager import ( IListManager, ListDeletingEvent, NoSuchListError) from mailman.interfaces.member import DeliveryMode, MemberRole @@ -152,10 +151,6 @@ class SubscriptionService: raise NoSuchListError(list_id) # Is the subscriber an email address or user id? if isinstance(subscriber, basestring): - # It's an email address, so we'll want a real name. Make sure - # it's a valid email address, and let InvalidEmailAddressError - # propagate up. - getUtility(IEmailValidator).validate(subscriber) if display_name is None: display_name, at, domain = subscriber.partition('@') # Because we want to keep the REST API simple, there is no -- cgit v1.2.3-70-g09d2