summaryrefslogtreecommitdiff
path: root/src/mailman/bin
diff options
context:
space:
mode:
authorBarry Warsaw2009-07-26 21:23:02 -0400
committerBarry Warsaw2009-07-26 21:23:02 -0400
commit46d51f3f1b7b241b079b0377d99f969f2fe1373f (patch)
tree7e5c097410c360d4c1cd9d23dd34dcdf22e0ee5a /src/mailman/bin
parent9c5c394a0912b56dd0fa1cabe07833aca24b92ef (diff)
downloadmailman-46d51f3f1b7b241b079b0377d99f969f2fe1373f.tar.gz
mailman-46d51f3f1b7b241b079b0377d99f969f2fe1373f.tar.zst
mailman-46d51f3f1b7b241b079b0377d99f969f2fe1373f.zip
Move BadDomainSpecificationError to domain.txt interface. Try to set this to
return an HTTP 400 error, though it does not seem to work. Expose list creation through the API.
Diffstat (limited to 'src/mailman/bin')
-rw-r--r--src/mailman/bin/create_list.py3
-rw-r--r--src/mailman/bin/import.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/mailman/bin/create_list.py b/src/mailman/bin/create_list.py
index 59be836a2..4d1f56db1 100644
--- a/src/mailman/bin/create_list.py
+++ b/src/mailman/bin/create_list.py
@@ -23,6 +23,7 @@ from mailman.app.lifecycle import create_list
from mailman.config import config
from mailman.core import errors
from mailman.email.message import UserNotification
+from mailman.interfaces.domain import BadDomainSpecificationError
from mailman.interfaces.listmanager import ListAlreadyExistsError
from mailman.options import SingleMailingListOptions
@@ -104,7 +105,7 @@ def main():
options.parser.error(_('Illegal list name: $fqdn_listname'))
except ListAlreadyExistsError:
options.parser.error(_('List already exists: $fqdn_listname'))
- except errors.BadDomainSpecificationError, domain:
+ except BadDomainSpecificationError, domain:
options.parser.error(_('Undefined domain: $domain'))
config.db.commit()
diff --git a/src/mailman/bin/import.py b/src/mailman/bin/import.py
index d2361e808..bc26e441b 100644
--- a/src/mailman/bin/import.py
+++ b/src/mailman/bin/import.py
@@ -26,13 +26,13 @@ from xml.dom import minidom
from xml.parsers.expat import ExpatError
from mailman import Defaults
-from mailman import errors
from mailman import MemberAdaptor
from mailman import Utils
from mailman import passwords
from mailman.MailList import MailList
from mailman.i18n import _
from mailman.initialize import initialize
+from mailman.interfaces.domain import BadDomainSpecificationError
from mailman.version import MAILMAN_VERSION
@@ -202,7 +202,7 @@ def create(all_listdata):
print _('Creating mailing list: $fqdn_listname')
mlist.Create(fqdn_listname, list_config['owner'][0],
list_config['password'])
- except errors.BadDomainSpecificationError:
+ except BadDomainSpecificationError:
print _('List is not in a supported domain: $fqdn_listname')
continue
# Save the list creation, then unlock and relock the list. This is so