summaryrefslogtreecommitdiff
path: root/src/mailman/commands/eml_membership.py
diff options
context:
space:
mode:
authorBarry Warsaw2011-01-01 11:28:29 -0500
committerBarry Warsaw2011-01-01 11:28:29 -0500
commit3f1f5a2826feb9c5fb202ae266ba7f0ff76ebe21 (patch)
tree1bab06750e306942180b18383c06ad2804f98677 /src/mailman/commands/eml_membership.py
parentd0f8e9e03d3c55641165b73a4d8971ec514a9cdc (diff)
downloadmailman-3f1f5a2826feb9c5fb202ae266ba7f0ff76ebe21.tar.gz
mailman-3f1f5a2826feb9c5fb202ae266ba7f0ff76ebe21.tar.zst
mailman-3f1f5a2826feb9c5fb202ae266ba7f0ff76ebe21.zip
Diffstat (limited to 'src/mailman/commands/eml_membership.py')
-rw-r--r--src/mailman/commands/eml_membership.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mailman/commands/eml_membership.py b/src/mailman/commands/eml_membership.py
index 26d96ce3c..7da742b39 100644
--- a/src/mailman/commands/eml_membership.py
+++ b/src/mailman/commands/eml_membership.py
@@ -144,36 +144,36 @@ class Leave:
def process(self, mlist, msg, msgdata, arguments, results):
"""See `IEmailCommand`."""
- address = msg.sender
- if not address:
+ email = msg.sender
+ if not email:
print >> results, _(
- '$self.name: No valid address found to unsubscribe')
+ '$self.name: No valid email address found to unsubscribe')
return ContinueProcessing.no
user_manager = getUtility(IUserManager)
- user = user_manager.get_user(address)
+ user = user_manager.get_user(email)
if user is None:
- print >> results, _('No registered user for address: $address')
+ print >> results, _('No registered user for email address: $email')
return ContinueProcessing.no
# The address that the -leave command was sent from, must be verified.
# Otherwise you could link a bogus address to anyone's account, and
# then send a leave command from that address.
- if user_manager.get_address(address).verified_on is None:
- print >> results, _('Invalid or unverified address: $address')
+ if user_manager.get_address(email).verified_on is None:
+ print >> results, _('Invalid or unverified email address: $email')
return ContinueProcessing.no
for user_address in user.addresses:
# Only recognize verified addresses.
if user_address.verified_on is None:
continue
- member = mlist.members.get_member(user_address.address)
+ member = mlist.members.get_member(user_address.email)
if member is not None:
break
else:
# None of the user's addresses are subscribed to this mailing list.
print >> results, _(
- '$self.name: $address is not a member of $mlist.fqdn_listname')
+ '$self.name: $email is not a member of $mlist.fqdn_listname')
return ContinueProcessing.no
member.unsubscribe()
- person = formataddr((user.real_name, address))
+ person = formataddr((user.real_name, email))
print >> results, _('$person left $mlist.fqdn_listname')
return ContinueProcessing.yes