12 files changed, 25 insertions, 19 deletions
diff --git a/mailman/database/address.py b/mailman/database/address.py
index f5039cf15..f9740deaf 100644
--- a/mailman/database/address.py
+++ b/mailman/database/address.py
@@ -29,7 +29,8 @@ from mailman.config import config
 from mailman.database.member import Member
 from mailman.database.model import Model
 from mailman.database.preferences import Preferences
-from mailman.interfaces import AlreadySubscribedError, IAddress
+from mailman.interfaces.member import AlreadySubscribedError
+from mailman.interfaces.address import IAddress
 
 
 
diff --git a/mailman/database/listmanager.py b/mailman/database/listmanager.py
index f6a0f5185..0a80a773e 100644
--- a/mailman/database/listmanager.py
+++ b/mailman/database/listmanager.py
@@ -24,7 +24,7 @@ from zope.interface import implements
 from mailman.Utils import split_listname, fqdn_listname
 from mailman.config import config
 from mailman.database.mailinglist import MailingList
-from mailman.interfaces import IListManager, ListAlreadyExistsError
+from mailman.interfaces.listmanager import IListManager, ListAlreadyExistsError
 
 
 
diff --git a/mailman/database/mailinglist.py b/mailman/database/mailinglist.py
index 483cc4749..eac8ad05d 100644
--- a/mailman/database/mailinglist.py
+++ b/mailman/database/mailinglist.py
@@ -28,7 +28,7 @@ from mailman.config import config
 from mailman.database import roster
 from mailman.database.model import Model
 from mailman.database.types import Enum
-from mailman.interfaces import IMailingList, Personalization
+from mailman.interfaces.mailinglist import IMailingList, Personalization
 
 
 SPACE = ' '
diff --git a/mailman/database/member.py b/mailman/database/member.py
index 244e0853b..a8deb3171 100644
--- a/mailman/database/member.py
+++ b/mailman/database/member.py
@@ -23,7 +23,8 @@ from mailman.config import config
 from mailman.constants import SystemDefaultPreferences
 from mailman.database.model import Model
 from mailman.database.types import Enum
-from mailman.interfaces import IMember, IPreferences
+from mailman.interfaces.member import IMember
+from mailman.interfaces.preferences import IPreferences
 
 
 
diff --git a/mailman/database/message.py b/mailman/database/message.py
index b62fe580b..f74de3c55 100644
--- a/mailman/database/message.py
+++ b/mailman/database/message.py
@@ -20,7 +20,7 @@ from zope.interface import implements
 
 from mailman.config import config
 from mailman.database.model import Model
-from mailman.interfaces import IMessage
+from mailman.interfaces.messages import IMessage
 
 
 
diff --git a/mailman/database/messagestore.py b/mailman/database/messagestore.py
index 934015b10..38c353172 100644
--- a/mailman/database/messagestore.py
+++ b/mailman/database/messagestore.py
@@ -31,7 +31,7 @@ from zope.interface import implements
 from mailman import Utils
 from mailman.config import config
 from mailman.database.message import Message
-from mailman.interfaces import IMessageStore
+from mailman.interfaces.messages import IMessageStore
 
 # It could be very bad if you have already stored files and you change this
 # value.  We'd need a script to reshuffle and resplit.
diff --git a/mailman/database/pending.py b/mailman/database/pending.py
index ff794c83c..9b7094b8b 100644
--- a/mailman/database/pending.py
+++ b/mailman/database/pending.py
@@ -30,7 +30,7 @@ from zope.interface.verify import verifyObject
 from mailman import Defaults
 from mailman.config import config
 from mailman.database.model import Model
-from mailman.interfaces import (
+from mailman.interfaces.pending import (
     IPendable, IPended, IPendedKeyValue, IPendings)
 
 
diff --git a/mailman/database/preferences.py b/mailman/database/preferences.py
index d7d899c44..244a1d2a7 100644
--- a/mailman/database/preferences.py
+++ b/mailman/database/preferences.py
@@ -20,7 +20,7 @@ from zope.interface import implements
 
 from mailman.database.model import Model
 from mailman.database.types import Enum
-from mailman.interfaces import IPreferences
+from mailman.interfaces.preferences import IPreferences
 
 
 
diff --git a/mailman/database/requests.py b/mailman/database/requests.py
index addaf08eb..6e9828cf9 100644
--- a/mailman/database/requests.py
+++ b/mailman/database/requests.py
@@ -17,6 +17,12 @@
 
 """Implementations of the IRequests and IListRequests interfaces."""
 
+__metaclass__ = type
+__all__ = [
+    'Requests',
+    ]
+
+
 from datetime import timedelta
 from storm.locals import *
 from zope.interface import implements
@@ -24,13 +30,8 @@ from zope.interface import implements
 from mailman.config import config
 from mailman.database.model import Model
 from mailman.database.types import Enum
-from mailman.interfaces import IListRequests, IPendable, IRequests, RequestType
-
-
-__metaclass__ = type
-__all__ = [
-    'Requests',
-    ]
+from mailman.interfaces.pending import IPendable
+from mailman.interfaces.requests import IListRequests, IRequests, RequestType
 
 
 
diff --git a/mailman/database/roster.py b/mailman/database/roster.py
index d044cc386..d0759e176 100644
--- a/mailman/database/roster.py
+++ b/mailman/database/roster.py
@@ -42,7 +42,8 @@ from mailman.config import config
 from mailman.constants import SystemDefaultPreferences
 from mailman.database.address import Address
 from mailman.database.member import Member
-from mailman.interfaces import DeliveryMode, IRoster, MemberRole
+from mailman.interfaces.member import DeliveryMode, MemberRole
+from mailman.interfaces.roster import IRoster
 
 
 
diff --git a/mailman/database/user.py b/mailman/database/user.py
index d54bb048f..1e2a7085d 100644
--- a/mailman/database/user.py
+++ b/mailman/database/user.py
@@ -24,8 +24,9 @@ from mailman.database.model import Model
 from mailman.database.address import Address
 from mailman.database.preferences import Preferences
 from mailman.database.roster import Memberships
-from mailman.interfaces import (
-    AddressAlreadyLinkedError, AddressNotLinkedError, IUser)
+from mailman.interfaces.address import (
+    AddressAlreadyLinkedError, AddressNotLinkedError)
+from mailman.interfaces.user import IUser
 
 
 
diff --git a/mailman/database/usermanager.py b/mailman/database/usermanager.py
index 87a8cd208..ea628c835 100644
--- a/mailman/database/usermanager.py
+++ b/mailman/database/usermanager.py
@@ -25,7 +25,8 @@ from mailman.config import config
 from mailman.database.address import Address
 from mailman.database.preferences import Preferences
 from mailman.database.user import User
-from mailman.interfaces import ExistingAddressError, IUserManager
+from mailman.interfaces.address import ExistingAddressError
+from mailman.interfaces.usermanager import IUserManager