summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurélien Bompard2015-03-20 16:51:14 +0100
committerAurélien Bompard2015-03-20 16:51:14 +0100
commitc906e12bfaefa2a81ad8e024d4e0b3fd7353901c (patch)
treee95bb6752e54df09cc4b748c8f2823c482f2b16c
parent34975c2d425e428d06c73f7ecae95e6058e5d058 (diff)
downloadmailman-c906e12bfaefa2a81ad8e024d4e0b3fd7353901c.tar.gz
mailman-c906e12bfaefa2a81ad8e024d4e0b3fd7353901c.tar.zst
mailman-c906e12bfaefa2a81ad8e024d4e0b3fd7353901c.zip
-rw-r--r--src/mailman/app/membership.py53
1 files changed, 0 insertions, 53 deletions
diff --git a/src/mailman/app/membership.py b/src/mailman/app/membership.py
index b64291d7c..3d06c7503 100644
--- a/src/mailman/app/membership.py
+++ b/src/mailman/app/membership.py
@@ -27,7 +27,6 @@ __all__ = [
from email.utils import formataddr
from mailman.app.notifications import (
send_goodbye_message, send_welcome_message)
-from mailman.config import config
from mailman.core.i18n import _
from mailman.email.message import OwnerNotification
from mailman.interfaces.bans import IBanManager
@@ -76,58 +75,6 @@ def add_member(mlist, record, role=MemberRole.member):
member = mlist.subscribe(address, role)
member.preferences.preferred_language = record.language
member.preferences.delivery_mode = record.delivery_mode
-# user = user_manager.get_user(email)
-# if user is None:
-# # A user linked to this address does not yet exist. Is the address
-# # itself known but just not linked to a user?
-# address = user_manager.get_address(email)
-# if address is None:
-# # Nope, we don't even know about this address, so create both the
-# # user and address now.
-# user = user_manager.create_user(email, display_name)
-# # Do it this way so we don't have to flush the previous change.
-# address = list(user.addresses)[0]
-# else:
-# # The address object exists, but it's not linked to a user.
-# # Create the user and link it now.
-# user = user_manager.create_user()
-# user.display_name = (
-# display_name if display_name else address.display_name)
-# user.link(address)
-# # Encrypt the password using the currently selected hash scheme.
-# user.password = config.password_context.encrypt(password)
-# user.preferences.preferred_language = language
-# member = mlist.subscribe(address, role)
-# member.preferences.delivery_mode = delivery_mode
-# else:
-# # The user exists and is linked to the case-insensitive address.
-# # We're looking for two versions of the email address, the case
-# # preserved version and the case insensitive version. We'll
-# # subscribe the version with matching case if it exists, otherwise
-# # we'll use one of the matching case-insensitively ones. It's
-# # undefined which one we pick.
-# case_preserved = None
-# case_insensitive = None
-# for address in user.addresses:
-# if address.original_email == email:
-# case_preserved = address
-# if address.email == email.lower():
-# case_insensitive = address
-# assert case_preserved is not None or case_insensitive is not None, (
-# 'Could not find a linked address for: {}'.format(email))
-# address = (case_preserved if case_preserved is not None
-# else case_insensitive)
-# # Create the member and set the appropriate preferences. It's
-# # possible we're subscribing the lower cased version of the address;
-# # if that's already subscribed re-issue the exception with the correct
-# # email address (i.e. the one passed in here).
-# try:
-# member = mlist.subscribe(address, role)
-# except AlreadySubscribedError as error:
-# raise AlreadySubscribedError(
-# error.fqdn_listname, email, error.role)
-# member.preferences.preferred_language = language
-# member.preferences.delivery_mode = delivery_mode
return member