Remove the mailman.interface magic. Use the more specific interface imports.

12 files changed, 21 insertions, 21 deletions

diff --git a/mailman/docs/addresses.txt b/mailman/docs/addresses.txt
index 6ddb8b8a9..9eccb2673 100644
--- a/mailman/docs/addresses.txt
+++ b/mailman/docs/addresses.txt
@@ -149,7 +149,7 @@ subscribed, a role is specified.
     >>> address_5 = usermgr.create_address(
     ...     u'eperson@example.com', u'Elly Person')
     >>> mlist = config.db.list_manager.create(u'_xtext@example.com')
-    >>> from mailman.interfaces import MemberRole
+    >>> from mailman.interfaces.member import MemberRole
     >>> address_5.subscribe(mlist, MemberRole.owner)
     <Member: Elly Person <eperson@example.com> on
              _xtext@example.com as MemberRole.owner>
diff --git a/mailman/docs/chains.txt b/mailman/docs/chains.txt
index b9fe45686..e9c5d74e4 100644
--- a/mailman/docs/chains.txt
+++ b/mailman/docs/chains.txt
@@ -15,7 +15,7 @@ The Discard chain
 The Discard chain simply throws the message away.
 
     >>> from zope.interface.verify import verifyObject
-    >>> from mailman.interfaces import IChain
+    >>> from mailman.interfaces.chain import IChain
     >>> chain = config.chains['discard']
     >>> verifyObject(IChain, chain)
     True
diff --git a/mailman/docs/languages.txt b/mailman/docs/languages.txt
index cd4e69241..775b933e8 100644
--- a/mailman/docs/languages.txt
+++ b/mailman/docs/languages.txt
@@ -6,7 +6,7 @@ languages at run time, as well as enabling those languages for use in a
 running Mailman instance.
 
     >>> from zope.interface.verify import verifyObject
-    >>> from mailman.interfaces import ILanguageManager
+    >>> from mailman.interfaces.languages import ILanguageManager
     >>> from mailman.languages import LanguageManager
     >>> mgr = LanguageManager()
     >>> verifyObject(ILanguageManager, mgr)
diff --git a/mailman/docs/lifecycle.txt b/mailman/docs/lifecycle.txt
index ab5e6ac23..1e28f03ce 100644
--- a/mailman/docs/lifecycle.txt
+++ b/mailman/docs/lifecycle.txt
@@ -45,7 +45,7 @@ Creating a list applies its styles
 Start by registering a test style.
 
     >>> from zope.interface import implements
-    >>> from mailman.interfaces import IStyle
+    >>> from mailman.interfaces.styles import IStyle
     >>> class TestStyle(object):
     ...     implements(IStyle)
     ...     name = 'test'
diff --git a/mailman/docs/listmanager.txt b/mailman/docs/listmanager.txt
index 1925e9466..830f6d962 100644
--- a/mailman/docs/listmanager.txt
+++ b/mailman/docs/listmanager.txt
@@ -6,7 +6,7 @@ objects.  The Mailman system instantiates an IListManager for you based on the
 configuration variable MANAGERS_INIT_FUNCTION.  The instance is accessible
 on the global config object.
 
-    >>> from mailman.interfaces import IListManager
+    >>> from mailman.interfaces.listmanager import IListManager
     >>> listmgr = config.db.list_manager
     >>> IListManager.providedBy(listmgr)
     True
@@ -17,7 +17,7 @@ Creating a mailing list
 
 Creating the list returns the newly created IMailList object.
 
-    >>> from mailman.interfaces import IMailingList
+    >>> from mailman.interfaces.mailinglist import IMailingList
     >>> mlist = listmgr.create(u'_xtest@example.com')
     >>> IMailingList.providedBy(mlist)
     True
diff --git a/mailman/docs/membership.txt b/mailman/docs/membership.txt
index cb6515532..7f9f16738 100644
--- a/mailman/docs/membership.txt
+++ b/mailman/docs/membership.txt
@@ -72,7 +72,7 @@ no users in the user database yet.
 We can add Anne as an owner of the mailing list, by creating a member role for
 her.
 
-    >>> from mailman.interfaces import MemberRole
+    >>> from mailman.interfaces.member import MemberRole
     >>> address_1 = list(user_1.addresses)[0]
     >>> address_1.address
     u'aperson@example.com'
diff --git a/mailman/docs/pending.txt b/mailman/docs/pending.txt
index f6895b818..abfba4885 100644
--- a/mailman/docs/pending.txt
+++ b/mailman/docs/pending.txt
@@ -12,7 +12,7 @@ This is not where messages held for administrator approval are kept.
 In order to pend an event, you first need a pending database, which is
 available by adapting the list manager.
 
-    >>> from mailman.interfaces import IPendings
+    >>> from mailman.interfaces.pending import IPendings
     >>> pendingdb = config.db.pendings
     >>> verifyObject(IPendings, pendingdb)
     True
@@ -20,7 +20,7 @@ available by adapting the list manager.
 The pending database can add any IPendable to the database, returning a token
 that can be used in urls and such.
 
-    >>> from mailman.interfaces import IPendable
+    >>> from mailman.interfaces.pending import IPendable
     >>> class SimplePendable(dict):
     ...     implements(IPendable)
     >>> subscription = SimplePendable(
diff --git a/mailman/docs/registration.txt b/mailman/docs/registration.txt
index a91980e0c..2e04f7ddf 100644
--- a/mailman/docs/registration.txt
+++ b/mailman/docs/registration.txt
@@ -8,7 +8,7 @@ may supply.  All registered email addresses must be verified before Mailman
 will send them any list traffic.
 
     >>> from mailman.app.registrar import Registrar
-    >>> from mailman.interfaces import IRegistrar
+    >>> from mailman.interfaces.registrar import IRegistrar
 
 The IUserManager manages users, but it does so at a fairly low level.
 Specifically, it does not handle verifications, email address syntax validity
@@ -319,7 +319,7 @@ Likewise, if you try to confirm, through the IUserRegistrar interface, a token
 that doesn't match a registration even, you will get None.  However, the
 pending even matched with that token will still be removed.
 
-    >>> from mailman.interfaces import IPendable
+    >>> from mailman.interfaces.pending import IPendable
     >>> from zope.interface import implements
 
     >>> class SimplePendable(dict):
diff --git a/mailman/docs/requests.txt b/mailman/docs/requests.txt
index 0ebb9ff8d..aa6f031bd 100644
--- a/mailman/docs/requests.txt
+++ b/mailman/docs/requests.txt
@@ -34,7 +34,7 @@ Mailing list centric
 A set of requests are always related to a particular mailing list, so given a
 mailing list you need to get its requests object.
 
-    >>> from mailman.interfaces import IListRequests, IRequests
+    >>> from mailman.interfaces.requests import IListRequests, IRequests
     >>> from zope.interface.verify import verifyObject
     >>> verifyObject(IRequests, config.db.requests)
     True
@@ -61,7 +61,7 @@ requires a request type (as an enum value), a key, and an optional dictionary
 of associated data.  The request database assigns no semantics to the held
 data, except for the request type.  Here we hold some simple bits of data.
 
-    >>> from mailman.interfaces import RequestType
+    >>> from mailman.interfaces.requests import RequestType
     >>> id_1 = requests.hold_request(RequestType.held_message,   u'hold_1')
     >>> id_2 = requests.hold_request(RequestType.subscription,   u'hold_2')
     >>> id_3 = requests.hold_request(RequestType.unsubscription, u'hold_3')
@@ -402,7 +402,7 @@ subscription must be provided, including the subscriber's address and real
 name, their password (possibly hashed), what kind of delivery option they are
 chosing and their preferred language.
 
-    >>> from mailman.interfaces import DeliveryMode
+    >>> from mailman.interfaces.member import DeliveryMode
     >>> mlist.admin_immed_notify = False
     >>> id_3 = moderator.hold_subscription(mlist,
     ...     u'bperson@example.org', u'Ben Person',
@@ -674,7 +674,7 @@ In this case, only the unsubscribing address is required.  Like subscriptions,
 unsubscription holds can send the list's moderators an immediate notification.
 
     >>> mlist.admin_immed_notify = False
-    >>> from mailman.interfaces import MemberRole
+    >>> from mailman.interfaces.member import MemberRole
     >>> user_1 = config.db.user_manager.create_user(u'gperson@example.com')
     >>> address_1 = list(user_1.addresses)[0]
     >>> address_1.subscribe(mlist, MemberRole.member)
diff --git a/mailman/docs/styles.txt b/mailman/docs/styles.txt
index f75a34798..49f337e15 100644
--- a/mailman/docs/styles.txt
+++ b/mailman/docs/styles.txt
@@ -61,7 +61,7 @@ Registering styles
 New styles must implement the IStyle interface.
 
     >>> from zope.interface import implements
-    >>> from mailman.interfaces import IStyle
+    >>> from mailman.interfaces.styles import IStyle
     >>> class TestStyle(object):
     ...     implements(IStyle)
     ...     name = 'test'
diff --git a/mailman/docs/usermanager.txt b/mailman/docs/usermanager.txt
index 5f03d84a6..f8cbfeef2 100644
--- a/mailman/docs/usermanager.txt
+++ b/mailman/docs/usermanager.txt
@@ -6,7 +6,7 @@ system instantiates an IUserManager for you based on the configuration
 variable MANAGERS_INIT_FUNCTION.  The instance is accessible on the global
 config object.
 
-    >>> from mailman.interfaces import IUserManager
+    >>> from mailman.interfaces.usermanager import IUserManager
     >>> from zope.interface.verify import verifyObject
     >>> usermgr = config.db.user_manager
     >>> verifyObject(IUserManager, usermgr)
@@ -21,7 +21,7 @@ create a 'blank' user by not providing an address or real name at creation
 time.  This user will have an empty string as their real name, but will not
 have a password.
 
-    >>> from mailman.interfaces import IUser
+    >>> from mailman.interfaces.user import IUser
     >>> user = usermgr.create_user()
     >>> verifyObject(IUser, user)
     True
diff --git a/mailman/docs/users.txt b/mailman/docs/users.txt
index e1f0e3302..ff7b9ca84 100644
--- a/mailman/docs/users.txt
+++ b/mailman/docs/users.txt
@@ -122,7 +122,7 @@ This is a helper function for the following section.
 
 Users have preferences, but these preferences have no default settings.
 
-    >>> from mailman.interfaces import IPreferences
+    >>> from mailman.interfaces.preferences import IPreferences
     >>> show_prefs(user_1.preferences)
     acknowledge_posts    : None
     preferred_language   : None
@@ -164,7 +164,7 @@ membership role.
     >>> mlist_1 = create_list(u'xtest_1@example.com')
     >>> mlist_2 = create_list(u'xtest_2@example.com')
     >>> mlist_3 = create_list(u'xtest_3@example.com')
-    >>> from mailman.interfaces import MemberRole
+    >>> from mailman.interfaces.member import MemberRole
 
     >>> com.subscribe(mlist_1, MemberRole.member)
     <Member: Zoe Person <zperson@example.com> on xtest_1@example.com as
@@ -178,7 +178,7 @@ membership role.
         MemberRole.moderator>
 
     >>> memberships = user_1.memberships
-    >>> from mailman.interfaces import IRoster
+    >>> from mailman.interfaces.roster import IRoster
     >>> from zope.interface.verify import verifyObject
     >>> verifyObject(IRoster, memberships)
     True