From 46d51f3f1b7b241b079b0377d99f969f2fe1373f Mon Sep 17 00:00:00 2001
From: Barry Warsaw
Date: Sun, 26 Jul 2009 21:23:02 -0400
Subject: 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.
---
 src/mailman/bin/create_list.py | 3 ++-
 src/mailman/bin/import.py      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/mailman/bin')

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
-- 
cgit v1.2.3-70-g09d2