4 files changed, 9 insertions, 20 deletions

diff --git a/src/mailman/core/i18n.py b/src/mailman/core/i18n.py
index ebe61894a..0f13f90c0 100644
--- a/src/mailman/core/i18n.py
+++ b/src/mailman/core/i18n.py
@@ -20,20 +20,15 @@
 import mailman.messages
 
 from flufl.i18n import PackageStrategy, registry
+from mailman import public
 from mailman.interfaces.configuration import ConfigurationUpdatedEvent
 
 
-# We can't use @mailman.public here because of circular imports.
-__all__ = [
-    '_',
-    'handle_ConfigurationUpdatedEvent',
-    'initialize',
-    ]
-
-
 _ = None
+__all__ = ['_']
 
 
+@public
 def initialize(application=None):
     """Initialize the i18n subsystem.
 
@@ -49,6 +44,7 @@ def initialize(application=None):
     _ = application._
 
 
+@public
 def handle_ConfigurationUpdatedEvent(event):
     if isinstance(event, ConfigurationUpdatedEvent):
         _.default = event.config.mailman.default_language
diff --git a/src/mailman/docs/__init__.py b/src/mailman/docs/__init__.py
index 89eda1e64..dc5c1f040 100644
--- a/src/mailman/docs/__init__.py
+++ b/src/mailman/docs/__init__.py
@@ -17,11 +17,7 @@
 
 """General Mailman doc tests."""
 
-__all__ = [
-    'layer',
-    ]
-
-
-
 from mailman.testing.layers import ConfigLayer
+
 layer = ConfigLayer
+__all__ = ['layer']
diff --git a/src/mailman/interfaces/errors.py b/src/mailman/interfaces/errors.py
index 6045e4868..dbf74c035 100644
--- a/src/mailman/interfaces/errors.py
+++ b/src/mailman/interfaces/errors.py
@@ -22,11 +22,9 @@ components.  More specific exceptions will be located in the relevant
 interfaces.
 """
 
-# We can't use @mailman.public here because of circular imports.
-__all__ = [
-    'MailmanError',
-    ]
+from mailman import public
 
 
+@public
 class MailmanError(Exception):
     """Base class for all Mailman exceptions."""
diff --git a/template.py b/template.py
index b38c5897b..4507f258b 100644
--- a/template.py
+++ b/template.py
@@ -17,5 +17,4 @@
 
 """Module stuff."""
 
-__all__ = [
-    ]
+from mailman import public