* Implement the style manager as a utility instead of an attribute hanging

   off the `mailman.config.config` object.
 * Fixed bogus use of `bounce_processing` attribute (should have been
   `process_bounces`, with thanks to Vincent Fretin.  (LP: #876774)

2 files changed, 7 insertions, 3 deletions

diff --git a/src/mailman/config/config.py b/src/mailman/config/config.py
index c687777a3..7d54643c7 100644
--- a/src/mailman/config/config.py
+++ b/src/mailman/config/config.py
@@ -38,7 +38,7 @@ import mailman.templates
 
 from mailman import version
 from mailman.interfaces.languages import ILanguageManager
-from mailman.styles.manager import StyleManager
+from mailman.interfaces.styles import IStyleManager
 from mailman.utilities.filesystem import makedirs
 from mailman.utilities.modules import call_name
 
@@ -59,7 +59,6 @@ class Configuration:
 
     def __init__(self):
         self.switchboards = {}
-        self.style_manager = StyleManager()
         self.QFILE_SCHEMA_VERSION = version.QFILE_SCHEMA_VERSION
         self._config = None
         self.filename = None
@@ -136,7 +135,7 @@ class Configuration:
             'System default language code not defined: %s' %
             self._config.mailman.default_language)
         self.ensure_directories_exist()
-        self.style_manager.populate()
+        getUtility(IStyleManager).populate()
         # Set the default system language.
         from mailman.core.i18n import _
         _.default = self.mailman.default_language
diff --git a/src/mailman/config/configure.zcml b/src/mailman/config/configure.zcml
index b5317aa69..bc08eb8c5 100644
--- a/src/mailman/config/configure.zcml
+++ b/src/mailman/config/configure.zcml
@@ -67,6 +67,11 @@
     />
 
   <utility
+   factory="mailman.styles.manager.StyleManager"
+   provides="mailman.interfaces.styles.IStyleManager"
+   />
+
+  <utility
     factory="mailman.app.subscriptions.SubscriptionService"
     provides="mailman.interfaces.subscriptions.ISubscriptionService"
     />