summaryrefslogtreecommitdiff
path: root/src/mailman/commands
diff options
context:
space:
mode:
authorBarry Warsaw2009-07-16 22:36:06 -0400
committerBarry Warsaw2009-07-16 22:36:06 -0400
commit1bfc7f302f2730a679b2a4a103c2978d8e7c70ae (patch)
tree3d69d43841dcf838e9778d2e83cc3e58a7b9ed20 /src/mailman/commands
parentac3af23142c9b2417759f90837d68e15866b6793 (diff)
downloadmailman-1bfc7f302f2730a679b2a4a103c2978d8e7c70ae.tar.gz
mailman-1bfc7f302f2730a679b2a4a103c2978d8e7c70ae.tar.zst
mailman-1bfc7f302f2730a679b2a4a103c2978d8e7c70ae.zip
Wow. Put domains into the database.
Add an IDomainManager and a global domain manager which can be gotten by adapting the global config object. Add an IDomainCollection interface for exposing the domain manager onto the API.
Diffstat (limited to 'src/mailman/commands')
-rw-r--r--src/mailman/commands/docs/join.txt3
-rw-r--r--src/mailman/commands/join.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mailman/commands/docs/join.txt b/src/mailman/commands/docs/join.txt
index 471a2a5b6..eaafddc7c 100644
--- a/src/mailman/commands/docs/join.txt
+++ b/src/mailman/commands/docs/join.txt
@@ -119,8 +119,9 @@ Once Anne confirms her registration, she will be made a member of the mailing
list.
>>> token = str(qmsg['subject']).split()[1].strip()
+ >>> from mailman.interfaces.domain import IDomainManager
>>> from mailman.interfaces.registrar import IRegistrar
- >>> registrar = IRegistrar(config.domains['example.com'])
+ >>> registrar = IRegistrar(IDomainManager(config)[u'example.com'])
>>> registrar.confirm(token)
True
diff --git a/src/mailman/commands/join.py b/src/mailman/commands/join.py
index 81a018cff..d1f9dd816 100644
--- a/src/mailman/commands/join.py
+++ b/src/mailman/commands/join.py
@@ -30,6 +30,7 @@ from zope.interface import implements
from mailman.config import config
from mailman.i18n import _
from mailman.interfaces.command import ContinueProcessing, IEmailCommand
+from mailman.interfaces.domain import IDomainManager
from mailman.interfaces.member import DeliveryMode
from mailman.interfaces.registrar import IRegistrar
@@ -66,7 +67,7 @@ example:
print >> results, _(
'$self.name: No valid address found to subscribe')
return ContinueProcessing.no
- domain = config.domains[mlist.host_name]
+ domain = IDomainManager(config)[mlist.host_name]
registrar = IRegistrar(domain)
registrar.register(address, real_name, mlist)
person = formataddr((real_name, address))