Merge the Python 3 branch.

4 files changed, 7 insertions, 23 deletions

diff --git a/src/mailman/styles/base.py b/src/mailman/styles/base.py
index 0d65bbebb..db4072b5c 100644
--- a/src/mailman/styles/base.py
+++ b/src/mailman/styles/base.py
@@ -23,9 +23,6 @@ methods in your compositional derived class.
 """
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'Announcement',
     'BasicOperation',
@@ -38,7 +35,6 @@ __all__ = [
 
 
 from datetime import timedelta
-
 from mailman.core.i18n import _
 from mailman.interfaces.action import Action, FilterAction
 from mailman.interfaces.archiver import ArchivePolicy
diff --git a/src/mailman/styles/default.py b/src/mailman/styles/default.py
index b12999f0e..f7ea3447f 100644
--- a/src/mailman/styles/default.py
+++ b/src/mailman/styles/default.py
@@ -17,21 +17,17 @@
 
 """Application of list styles to new and existing lists."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'LegacyDefaultStyle',
     'LegacyAnnounceOnly',
     ]
 
 
-from zope.interface import implementer
-
 from mailman.interfaces.styles import IStyle
 from mailman.styles.base import (
     Announcement, BasicOperation, Bounces, Discussion, Identity, Moderation,
     Public)
+from zope.interface import implementer
 
 
 
diff --git a/src/mailman/styles/manager.py b/src/mailman/styles/manager.py
index 397902c17..59cbb1471 100644
--- a/src/mailman/styles/manager.py
+++ b/src/mailman/styles/manager.py
@@ -17,23 +17,19 @@
 
 """Style manager."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'StyleManager',
     'handle_ConfigurationUpdatedEvent',
     ]
 
 
-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 find_components
+from zope.component import getUtility
+from zope.interface import implementer
+from zope.interface.verify import verifyObject
 
 
 
diff --git a/src/mailman/styles/tests/test_styles.py b/src/mailman/styles/tests/test_styles.py
index 1fb7a8410..8e8d2eb19 100644
--- a/src/mailman/styles/tests/test_styles.py
+++ b/src/mailman/styles/tests/test_styles.py
@@ -17,9 +17,6 @@
 
 """Test styles."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestStyle',
     ]
@@ -27,13 +24,12 @@ __all__ = [
 
 import unittest
 
-from zope.component import getUtility
-from zope.interface import implementer
-from zope.interface.exceptions import DoesNotImplement
-
 from mailman.interfaces.styles import (
     DuplicateStyleError, IStyle, IStyleManager)
 from mailman.testing.layers import ConfigLayer
+from zope.component import getUtility
+from zope.interface import implementer
+from zope.interface.exceptions import DoesNotImplement