21 files changed, 35 insertions, 32 deletions

diff --git a/mailman/app/commands.py b/mailman/app/commands.py
index f35ea531e..6ff6fdf0a 100644
--- a/mailman/app/commands.py
+++ b/mailman/app/commands.py
@@ -23,8 +23,8 @@ __all__ = [
     ]
 
 
-from mailman.app.plugins import get_plugins
 from mailman.configuration import config
+from mailman.core.plugins import get_plugins
 from mailman.interfaces import IEmailCommand
 
 
diff --git a/mailman/app/lifecycle.py b/mailman/app/lifecycle.py
index 363ade2c4..b707fdbbd 100644
--- a/mailman/app/lifecycle.py
+++ b/mailman/app/lifecycle.py
@@ -31,14 +31,13 @@ import logging
 
 from mailman import Utils
 from mailman.Utils import ValidateEmail
-from mailman.app.plugins import get_plugin
-from mailman.app.styles import style_manager
 from mailman.configuration import config
 from mailman.core import errors
+from mailman.core.plugins import get_plugin
+from mailman.core.styles import style_manager
 from mailman.interfaces import MemberRole
 
 
-
 log = logging.getLogger('mailman.error')
 
 
diff --git a/mailman/archiving/__init__.py b/mailman/archiving/__init__.py
index 203d4d78c..41dff720c 100644
--- a/mailman/archiving/__init__.py
+++ b/mailman/archiving/__init__.py
@@ -21,8 +21,8 @@ __all__ = [
     ]
 
 
-from mailman.app.plugins import get_plugins
 from mailman.configuration import config
+from mailman.core.plugins import get_plugins
 
 
 def initialize():
diff --git a/mailman/app/chains.py b/mailman/core/chains.py
index bebbf5bee..bebbf5bee 100644
--- a/mailman/app/chains.py
+++ b/mailman/core/chains.py
diff --git a/mailman/app/pipelines.py b/mailman/core/pipelines.py
index 949ed9e42..c790901b2 100644
--- a/mailman/app/pipelines.py
+++ b/mailman/core/pipelines.py
@@ -27,8 +27,8 @@ __all__ = [
 from zope.interface import implements
 from zope.interface.verify import verifyObject
 
-from mailman.app.plugins import get_plugins
 from mailman.configuration import config
+from mailman.core.plugins import get_plugins
 from mailman.i18n import _
 from mailman.interfaces import IHandler, IPipeline
 
diff --git a/mailman/app/plugins.py b/mailman/core/plugins.py
index cf22ad377..cf22ad377 100644
--- a/mailman/app/plugins.py
+++ b/mailman/core/plugins.py
diff --git a/mailman/app/rules.py b/mailman/core/rules.py
index b48673690..2c1e4fb3b 100644
--- a/mailman/app/rules.py
+++ b/mailman/core/rules.py
@@ -17,15 +17,17 @@
 
 """Various rule helpers"""
 
-__all__ = ['initialize']
 __metaclass__ = type
+__all__ = [
+    'initialize',
+    ]
 
 
 from zope.interface import implements
 from zope.interface.verify import verifyObject
 
-from mailman.app.plugins import get_plugins
 from mailman.configuration import config
+from mailman.core.plugins import get_plugins
 from mailman.interfaces import IRule
 
 
diff --git a/mailman/app/styles.py b/mailman/core/styles.py
index 8f487177e..96104c204 100644
--- a/mailman/app/styles.py
+++ b/mailman/core/styles.py
@@ -30,8 +30,8 @@ from zope.interface import implements
 from zope.interface.verify import verifyObject
 
 from mailman import Utils
-from mailman.app.plugins import get_plugins
 from mailman.configuration import config
+from mailman.core.plugins import get_plugins
 from mailman.i18n import _
 from mailman.interfaces import (
     Action, DuplicateStyleError, IStyle, IStyleManager, NewsModeration,
diff --git a/mailman/docs/chains.txt b/mailman/docs/chains.txt
index 964ef0edb..1118df687 100644
--- a/mailman/docs/chains.txt
+++ b/mailman/docs/chains.txt
@@ -36,7 +36,7 @@ The Discard chain simply throws the message away.
     ... An important message.
     ... """)
 
-    >>> from mailman.app.chains import process
+    >>> from mailman.core.chains import process
 
     # XXX This checks the vette log file because there is no other evidence
     # that this chain has done anything.
@@ -309,7 +309,6 @@ The previously created message is innocuous enough that it should pass through
 all default rules.  This message will end up in the pipeline queue.
 
     >>> file_pos = fp.tell()
-    >>> from mailman.app.chains import process
     >>> process(mlist, msg, {})
     >>> fp.seek(file_pos)
     >>> print 'LOG:', fp.read()
diff --git a/mailman/docs/lifecycle.txt b/mailman/docs/lifecycle.txt
index e5b0f726c..69f656208 100644
--- a/mailman/docs/lifecycle.txt
+++ b/mailman/docs/lifecycle.txt
@@ -57,7 +57,7 @@ Start by registering a test style.
     ...         # Applies to any test list
     ...         if 'test' in mailing_list.fqdn_listname:
     ...             styles.append(self)
-    >>> from mailman.app.styles import style_manager
+    >>> from mailman.core.styles import style_manager
     >>> style_manager.register(TestStyle())
 
 Using the higher level interface for creating a list, applies all matching
diff --git a/mailman/docs/pipelines.txt b/mailman/docs/pipelines.txt
index c4f8488a1..ab6b99aa3 100644
--- a/mailman/docs/pipelines.txt
+++ b/mailman/docs/pipelines.txt
@@ -13,7 +13,7 @@ message once it's started.
     >>> mlist.web_page_url = u'http://lists.example.com/archives/'
     >>> mlist.pipeline
     u'built-in'
-    >>> from mailman.app.pipelines import process
+    >>> from mailman.core.pipelines import process
 
 
 Processing a message
diff --git a/mailman/docs/styles.txt b/mailman/docs/styles.txt
index 88bdd9cf5..37b3b20e2 100644
--- a/mailman/docs/styles.txt
+++ b/mailman/docs/styles.txt
@@ -15,7 +15,7 @@ Let's start with a vanilla mailing list and a default style manager.
 
     >>> from mailman.configuration import config
     >>> mlist = config.db.list_manager.create(u'_xtest@example.com')
-    >>> from mailman.app.styles import style_manager
+    >>> from mailman.core.styles import style_manager
 
 
 The default style
diff --git a/mailman/initialize.py b/mailman/initialize.py
index fd6fd5b26..ea7c294c8 100644
--- a/mailman/initialize.py
+++ b/mailman/initialize.py
@@ -32,7 +32,7 @@ from zope.interface.verify import verifyObject
 import mailman.configuration
 import mailman.loginit
 
-from mailman.app.plugins import get_plugin
+from mailman.core.plugins import get_plugin
 from mailman.interfaces import IDatabase
 
 
@@ -88,11 +88,11 @@ def initialize_2(debug=False):
     mailman.configuration.config.db = database
     # Initialize the rules and chains.  Do the imports here so as to avoid
     # circular imports.
-    from mailman.archiving import initialize as initialize_archivers
-    from mailman.app.chains import initialize as initialize_chains
-    from mailman.app.rules import initialize as initialize_rules
-    from mailman.app.pipelines import initialize as initialize_pipelines
     from mailman.app.commands import initialize as initialize_commands
+    from mailman.archiving import initialize as initialize_archivers
+    from mailman.core.chains import initialize as initialize_chains
+    from mailman.core.pipelines import initialize as initialize_pipelines
+    from mailman.core.rules import initialize as initialize_rules
     initialize_archivers()
     initialize_rules()
     initialize_chains()
diff --git a/mailman/pipeline/cook_headers.py b/mailman/pipeline/cook_headers.py
index 348380078..362c8ecf7 100644
--- a/mailman/pipeline/cook_headers.py
+++ b/mailman/pipeline/cook_headers.py
@@ -18,20 +18,22 @@
 """Cook a message's headers."""
 
 __metaclass__ = type
-__all__ = ['CookHeaders']
+__all__ = [
+    'CookHeaders',
+    ]
 
 
 import re
 
-from email.Charset import Charset
-from email.Errors import HeaderParseError
-from email.Header import Header, decode_header, make_header
-from email.Utils import parseaddr, formataddr, getaddresses
+from email.charset import Charset
+from email.errors import HeaderParseError
+from email.header import Header, decode_header, make_header
+from email.utils import parseaddr, formataddr, getaddresses
 from zope.interface import implements
 
 from mailman import Utils
-from mailman.app.plugins import get_plugins
 from mailman.configuration import config
+from mailman.core.plugins import get_plugins
 from mailman.i18n import _
 from mailman.interfaces import IHandler, Personalization, ReplyToMunging
 from mailman.version import VERSION
diff --git a/mailman/pipeline/scrubber.py b/mailman/pipeline/scrubber.py
index a538de1e9..8e2b1503e 100644
--- a/mailman/pipeline/scrubber.py
+++ b/mailman/pipeline/scrubber.py
@@ -39,12 +39,13 @@ from mimetypes import guess_all_extensions
 from zope.interface import implements
 
 from mailman import Utils
-from mailman.app.plugins import get_plugin
 from mailman.configuration import config
 from mailman.core.errors import DiscardMessage
+from mailman.core.plugins import get_plugin
 from mailman.i18n import _
 from mailman.interfaces import IHandler
 
+
 # Path characters for common platforms
 pre = re.compile(r'[/\\:]')
 # All other characters to strip out of Content-Disposition: filenames
diff --git a/mailman/queue/archive.py b/mailman/queue/archive.py
index 32c49804f..a10ae3e9c 100644
--- a/mailman/queue/archive.py
+++ b/mailman/queue/archive.py
@@ -32,8 +32,8 @@ from datetime import datetime
 from email.Utils import parsedate_tz, mktime_tz, formatdate
 from locknix.lockfile import Lock
 
-from mailman.app.plugins import get_plugins
 from mailman.configuration import config
+from mailman.core.plugins import get_plugins
 from mailman.queue import Runner
 
 
diff --git a/mailman/queue/incoming.py b/mailman/queue/incoming.py
index 635b1833a..d4decd435 100644
--- a/mailman/queue/incoming.py
+++ b/mailman/queue/incoming.py
@@ -26,8 +26,8 @@ prepared for delivery.  Rejections, discards, and holds are processed
 immediately.
 """
 
-from mailman.app.chains import process
 from mailman.configuration import config
+from mailman.core.chains import process
 from mailman.queue import Runner
 
 
diff --git a/mailman/rules/docs/emergency.txt b/mailman/rules/docs/emergency.txt
index 56eceaccb..6437ba626 100644
--- a/mailman/rules/docs/emergency.txt
+++ b/mailman/rules/docs/emergency.txt
@@ -19,7 +19,7 @@ list are held for moderator approval.
 The emergency rule is matched as part of the built-in chain.  The emergency
 rule matches if the flag is set on the mailing list.
 
-    >>> from mailman.app.chains import process
+    >>> from mailman.core.chains import process
     >>> mlist.emergency = True
     >>> process(mlist, msg, {}, 'built-in')
 
diff --git a/mailman/rules/docs/header-matching.txt b/mailman/rules/docs/header-matching.txt
index 78554526a..0dd917a71 100644
--- a/mailman/rules/docs/header-matching.txt
+++ b/mailman/rules/docs/header-matching.txt
@@ -28,7 +28,7 @@ the chain untouched (i.e. no disposition).
     ... This is a message.
     ... """)
 
-    >>> from mailman.app.chains import process
+    >>> from mailman.core.chains import process
 
 Pass through is seen as nothing being in the log file after processing.
 
diff --git a/mailman/tests/test_documentation.py b/mailman/tests/test_documentation.py
index ff3dd8378..cf53be245 100644
--- a/mailman/tests/test_documentation.py
+++ b/mailman/tests/test_documentation.py
@@ -27,8 +27,8 @@ from email import message_from_string
 import mailman
 
 from mailman.Message import Message
-from mailman.app.styles import style_manager
 from mailman.configuration import config
+from mailman.core.styles import style_manager
 from mailman.testing.helpers import SMTPServer
 
 
diff --git a/setup.py b/setup.py
index 60ffef3bf..42c204039 100644
--- a/setup.py
+++ b/setup.py
@@ -101,7 +101,7 @@ case second `m'.  Any other spelling is incorrect.""",
         'mailman.commands'  : list(commands),
         'mailman.database'  : 'stock = mailman.database:StockDatabase',
         'mailman.mta'       : 'stock = mailman.MTA:Manual',
-        'mailman.styles'    : 'default = mailman.app.styles:DefaultStyle',
+        'mailman.styles'    : 'default = mailman.core.styles:DefaultStyle',
         'mailman.mta'       : 'stock = mailman.MTA:Manual',
         'mailman.rules'     : 'default = mailman.rules:initialize',
         'mailman.handlers'  : 'default = mailman.pipeline:initialize',