9 files changed, 74 insertions, 49 deletions

diff --git a/src/mailman/app/events.py b/src/mailman/app/events.py
index 79376cca1..a4f385239 100644
--- a/src/mailman/app/events.py
+++ b/src/mailman/app/events.py
@@ -28,13 +28,22 @@ __all__ = [
 from zope import event
 
 from mailman.app import domain, moderator, subscriptions
+from mailman.core import i18n, switchboard
+from mailman.languages import manager as language_manager
+from mailman.styles import manager as style_manager
+from mailman.utilities import passwords
 
 
 
 def initialize():
     """Initialize global event subscribers."""
     event.subscribers.extend([
+        domain.handle_DomainDeletingEvent,
         moderator.handle_ListDeletingEvent,
+        passwords.handle_ConfigurationUpdatedEvent,
         subscriptions.handle_ListDeletedEvent,
-        domain.handle_DomainDeletingEvent,
+        switchboard.handle_ConfigurationUpdatedEvent,
+        i18n.handle_ConfigurationUpdatedEvent,
+        style_manager.handle_ConfigurationUpdatedEvent,
+        language_manager.handle_ConfigurationUpdatedEvent,
         ])
diff --git a/src/mailman/config/config.py b/src/mailman/config/config.py
index 0cd5e0e32..f6c39fcec 100644
--- a/src/mailman/config/config.py
+++ b/src/mailman/config/config.py
@@ -41,7 +41,6 @@ from mailman import version
 from mailman.interfaces.configuration import (
     ConfigurationUpdatedEvent, IConfiguration)
 from mailman.interfaces.languages import ILanguageManager
-from mailman.interfaces.styles import IStyleManager
 from mailman.utilities.filesystem import makedirs
 from mailman.utilities.modules import call_name
 
@@ -117,26 +116,7 @@ class Configuration:
         """Perform post-processing after loading the configuration files."""
         # Expand and set up all directories.
         self._expand_paths()
-        # Set up the switchboards.  Import this here to avoid circular imports.
-        from mailman.core.switchboard import Switchboard
-        Switchboard.initialize()
-        # Set up all the languages.
-        languages = self._config.getByCategory('language', [])
-        language_manager = getUtility(ILanguageManager)
-        for language in languages:
-            if language.enabled:
-                code = language.name.split('.')[1]
-                language_manager.add(
-                    code, language.charset, language.description)
-        # The default language must always be available.
-        assert self._config.mailman.default_language in language_manager, (
-            'System default language code not defined: %s' %
-            self._config.mailman.default_language)
         self.ensure_directories_exist()
-        getUtility(IStyleManager).populate()
-        # Set the default system language.
-        from mailman.core.i18n import _
-        _.default = self.mailman.default_language
         notify(ConfigurationUpdatedEvent(self))
 
     def _expand_paths(self):
@@ -249,3 +229,9 @@ class Configuration:
         """Iterate over all the style configuration sections."""
         for section in self._config.getByCategory('style', []):
             yield section
+
+    @property
+    def language_configs(self):
+        """Iterate over all the language configuration sections."""
+        for section in self._config.getByCategory('language', []):
+            yield section
diff --git a/src/mailman/core/i18n.py b/src/mailman/core/i18n.py
index 2d7c382c7..73453ae65 100644
--- a/src/mailman/core/i18n.py
+++ b/src/mailman/core/i18n.py
@@ -31,7 +31,7 @@ import time
 from flufl.i18n import PackageStrategy, registry
 
 import mailman.messages
-
+from mailman.interfaces.configuration import ConfigurationUpdatedEvent
 
 _ = None
 
@@ -113,3 +113,9 @@ def ctime(date):
     wday = daysofweek[wday]
     mon = months[mon]
     return _('$wday $mon $day $hh:$mm:$ss $tzname $year')
+
+
+
+def handle_ConfigurationUpdatedEvent(event):
+    if isinstance(event, ConfigurationUpdatedEvent):
+        _.default = event.config.mailman.default_language
diff --git a/src/mailman/core/initialize.py b/src/mailman/core/initialize.py
index 255e22ed9..f4659e638 100644
--- a/src/mailman/core/initialize.py
+++ b/src/mailman/core/initialize.py
@@ -112,8 +112,8 @@ def initialize_1(config_path=None):
     os.umask(007)
     # Initialize configuration event subscribers.  This must be done before
     # setting up the configuration system.
-    from mailman.utilities.passwords import initialize as initialize_passwords
-    initialize_passwords()
+    from mailman.app.events import initialize as initialize_events
+    initialize_events()
     # config_path will be set if the command line argument -C is given.  That
     # case overrides all others.  When not given on the command line, the
     # configuration file is searched for in the file system.
@@ -156,7 +156,6 @@ def initialize_2(debug=False, propagate_logs=None):
     # Initialize the rules and chains.  Do the imports here so as to avoid
     # circular imports.
     from mailman.app.commands import initialize as initialize_commands
-    from mailman.app.events import initialize as initialize_events
     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
@@ -165,7 +164,6 @@ def initialize_2(debug=False, propagate_logs=None):
     initialize_chains()
     initialize_pipelines()
     initialize_commands()
-    initialize_events()
 
 
 def initialize_3():
diff --git a/src/mailman/core/switchboard.py b/src/mailman/core/switchboard.py
index c65b92fac..1f16cb5fb 100644
--- a/src/mailman/core/switchboard.py
+++ b/src/mailman/core/switchboard.py
@@ -29,6 +29,7 @@ from __future__ import absolute_import, print_function, unicode_literals
 __metaclass__ = type
 __all__ = [
     'Switchboard',
+    'handle_ConfigurationUpdatedEvent',
     ]
 
 
@@ -44,6 +45,7 @@ from zope.interface import implementer
 
 from mailman.config import config
 from mailman.email.message import Message
+from mailman.interfaces.configuration import ConfigurationUpdatedEvent
 from mailman.interfaces.switchboard import ISwitchboard
 from mailman.utilities.filesystem import makedirs
 from mailman.utilities.string import expand
@@ -67,18 +69,6 @@ elog = logging.getLogger('mailman.error')
 class Switchboard:
     """See `ISwitchboard`."""
 
-    @staticmethod
-    def initialize():
-        """Initialize the global switchboards for input/output."""
-        for conf in config.runner_configs:
-            name = conf.name.split('.')[-1]
-            assert name not in config.switchboards, (
-                'Duplicate runner name: {0}'.format(name))
-            substitutions = config.paths
-            substitutions['name'] = name
-            path = expand(conf.path, substitutions)
-            config.switchboards[name] = Switchboard(name, path)
-
     def __init__(self, name, queue_directory,
                  slice=None, numslices=1, recover=False):
         """Create a switchboard object.
@@ -264,3 +254,19 @@ class Switchboard:
                         self.finish(filebase, preserve=True)
                     else:
                         os.rename(src, dst)
+
+
+
+def handle_ConfigurationUpdatedEvent(event):
+    """Initialize the global switchboards for input/output."""
+    if not isinstance(event, ConfigurationUpdatedEvent):
+        return
+    config = event.config
+    for conf in config.runner_configs:
+        name = conf.name.split('.')[-1]
+        assert name not in config.switchboards, (
+            'Duplicate runner name: {0}'.format(name))
+        substitutions = config.paths
+        substitutions['name'] = name
+        path = expand(conf.path, substitutions)
+        config.switchboards[name] = Switchboard(name, path)
diff --git a/src/mailman/languages/manager.py b/src/mailman/languages/manager.py
index 7844bd87c..87b56dbda 100644
--- a/src/mailman/languages/manager.py
+++ b/src/mailman/languages/manager.py
@@ -24,8 +24,11 @@ __all__ = [
     'LanguageManager',
     ]
 
+
+from zope.component import getUtility
 from zope.interface import implementer
 
+from mailman.interfaces.configuration import ConfigurationUpdatedEvent
 from mailman.interfaces.languages import ILanguageManager
 from mailman.languages.language import Language
 
@@ -72,3 +75,18 @@ class LanguageManager:
     def clear(self):
         """See `ILanguageManager`."""
         self._languages.clear()
+
+
+
+def handle_ConfigurationUpdatedEvent(event):
+    if not isinstance(event, ConfigurationUpdatedEvent):
+        return
+    manager = getUtility(ILanguageManager)
+    for language in event.config.language_configs:
+        if language.enabled:
+            code = language.name.split('.')[1]
+            manager.add(code, language.charset, language.description)
+    # the default language must always be available.
+    assert event.config.mailman.default_language in manager, (
+        'system default language code not defined: {0}'.format(
+            event.config.mailman.default_language))
diff --git a/src/mailman/styles/manager.py b/src/mailman/styles/manager.py
index 8ec832f18..c2729abfb 100644
--- a/src/mailman/styles/manager.py
+++ b/src/mailman/styles/manager.py
@@ -22,13 +22,16 @@ from __future__ import absolute_import, print_function, unicode_literals
 __metaclass__ = type
 __all__ = [
     'StyleManager',
+    'handle_ConfigurationUpdatedEvent',
     ]
 
 
 from operator import attrgetter
+from zope.component import getUtility
 from zope.interface import implementer
 from zope.interface.verify import verifyObject
 
+from mailman.interfaces.configuration import ConfigurationUpdatedEvent
 from mailman.interfaces.styles import (
     DuplicateStyleError, IStyle, IStyleManager)
 from mailman.utilities.modules import call_name
@@ -88,3 +91,9 @@ class StyleManager:
         """See `IStyleManager`."""
         # Let KeyErrors percolate up.
         del self._styles[style.name]
+
+
+
+def handle_ConfigurationUpdatedEvent(event):
+    if isinstance(event, ConfigurationUpdatedEvent):
+        getUtility(IStyleManager).populate()
diff --git a/src/mailman/testing/helpers.py b/src/mailman/testing/helpers.py
index 5252c5334..84f215574 100644
--- a/src/mailman/testing/helpers.py
+++ b/src/mailman/testing/helpers.py
@@ -343,14 +343,14 @@ def call_api(url, data=None, method=None, username=None, password=None):
 
 @contextmanager
 def event_subscribers(*subscribers):
-    """Temporarily set the Zope event subscribers list.
+    """Temporarily extend the Zope event subscribers list.
 
     :param subscribers: A sequence of event subscribers.
     :type subscribers: sequence of callables, each receiving one argument, the
         event.
     """
     old_subscribers = event.subscribers[:]
-    event.subscribers = list(subscribers)
+    event.subscribers.extend(subscribers)
     try:
         yield
     finally:
diff --git a/src/mailman/utilities/passwords.py b/src/mailman/utilities/passwords.py
index 65c4ff291..95c85c47a 100644
--- a/src/mailman/utilities/passwords.py
+++ b/src/mailman/utilities/passwords.py
@@ -21,14 +21,13 @@ from __future__ import absolute_import, print_function, unicode_literals
 
 __metaclass__ = type
 __all__ = [
-    'initialize',
+    'handle_ConfigurationUpdatedEvent',
     ]
 
 
 
 from passlib.context import CryptContext
 from pkg_resources import resource_string
-from zope import event
 
 from mailman.interfaces.configuration import ConfigurationUpdatedEvent
 
@@ -57,13 +56,7 @@ class PasswordContext:
 
 
 
-# Create and register a post-processing handler for the configuration file.
-
-def _update_context(event):
+def handle_ConfigurationUpdatedEvent(event):
     if isinstance(event, ConfigurationUpdatedEvent):
         # Just reset the password context.
         event.config.password_context = PasswordContext(event.config)
-
-
-def initialize():
-    event.subscribers.append(_update_context)