16 files changed, 21 insertions, 67 deletions
diff --git a/src/mailman/utilities/datetime.py b/src/mailman/utilities/datetime.py
index b494e2513..3cea0d0cd 100644
--- a/src/mailman/utilities/datetime.py
+++ b/src/mailman/utilities/datetime.py
@@ -22,10 +22,6 @@ datetime.datetime.now() and datetime.date.today().  These are better
 instrumented for testing purposes.
 """
 
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'DateFactory',
     'RFC822_DATE_FMT',
diff --git a/src/mailman/utilities/email.py b/src/mailman/utilities/email.py
index 0237042c7..bedbd2ae9 100644
--- a/src/mailman/utilities/email.py
+++ b/src/mailman/utilities/email.py
@@ -17,9 +17,6 @@
 
 """Email helpers."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'add_message_hash',
     'split_email',
diff --git a/src/mailman/utilities/filesystem.py b/src/mailman/utilities/filesystem.py
index f2a5b705b..4ef52cbfa 100644
--- a/src/mailman/utilities/filesystem.py
+++ b/src/mailman/utilities/filesystem.py
@@ -17,9 +17,6 @@
 
 """Filesystem utilities."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'makedirs',
     'umask',
diff --git a/src/mailman/utilities/i18n.py b/src/mailman/utilities/i18n.py
index e9136837f..16f2fee6b 100644
--- a/src/mailman/utilities/i18n.py
+++ b/src/mailman/utilities/i18n.py
@@ -17,9 +17,6 @@
 
 """i18n template search and interpolation."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TemplateNotFoundError',
     'find',
@@ -34,13 +31,12 @@ import sys
 import errno
 
 from itertools import product
-from pkg_resources import resource_filename
-
 from mailman.config import config
 from mailman.core.constants import system_preferences
 from mailman.core.errors import MailmanException
 from mailman.core.i18n import _
 from mailman.utilities.string import expand, wrap as wrap_text
+from pkg_resources import resource_filename
 
 
 
diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py
index c93080c91..2db5f3ace 100644
--- a/src/mailman/utilities/importer.py
+++ b/src/mailman/utilities/importer.py
@@ -17,9 +17,6 @@
 
 """Importer routines."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'Import21Error',
     'import_config_pck',
diff --git a/src/mailman/utilities/interact.py b/src/mailman/utilities/interact.py
index 8bca9ee40..cdc2b3002 100644
--- a/src/mailman/utilities/interact.py
+++ b/src/mailman/utilities/interact.py
@@ -17,9 +17,6 @@
 
 """Provide an interactive prompt, mimicking the Python interpreter."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'interact',
     ]
diff --git a/src/mailman/utilities/mailbox.py b/src/mailman/utilities/mailbox.py
index 4f085e127..71e083792 100644
--- a/src/mailman/utilities/mailbox.py
+++ b/src/mailman/utilities/mailbox.py
@@ -15,11 +15,8 @@
 # You should have received a copy of the GNU General Public License along with
 # GNU Mailman.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Module stuff."""
+"""MMDF helper for digests."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'Mailbox',
     ]
diff --git a/src/mailman/utilities/modules.py b/src/mailman/utilities/modules.py
index 9ff0e50cd..2a63ac501 100644
--- a/src/mailman/utilities/modules.py
+++ b/src/mailman/utilities/modules.py
@@ -17,9 +17,6 @@
 
 """Package and module utilities."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'call_name',
     'expand_path',
diff --git a/src/mailman/utilities/passwords.py b/src/mailman/utilities/passwords.py
index 6fb7f08c0..f29482572 100644
--- a/src/mailman/utilities/passwords.py
+++ b/src/mailman/utilities/passwords.py
@@ -17,19 +17,14 @@
 
 """A wrapper around passlib."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'handle_ConfigurationUpdatedEvent',
     ]
 
 
-
-from passlib.context import CryptContext
-
 from mailman.config.config import load_external
 from mailman.interfaces.configuration import ConfigurationUpdatedEvent
+from passlib.context import CryptContext
 
 
 
diff --git a/src/mailman/utilities/string.py b/src/mailman/utilities/string.py
index 5f0ae03c9..6bbf3c6ea 100644
--- a/src/mailman/utilities/string.py
+++ b/src/mailman/utilities/string.py
@@ -17,9 +17,6 @@
 
 """String utilities."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'expand',
     'oneline',
diff --git a/src/mailman/utilities/tests/test_email.py b/src/mailman/utilities/tests/test_email.py
index 1448fb32b..838d50862 100644
--- a/src/mailman/utilities/tests/test_email.py
+++ b/src/mailman/utilities/tests/test_email.py
@@ -17,9 +17,6 @@
 
 """Testing functions in the email utilities."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestEmail',
     ]
diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py
index 09d2f351c..192e08df5 100644
--- a/src/mailman/utilities/tests/test_import.py
+++ b/src/mailman/utilities/tests/test_import.py
@@ -17,12 +17,14 @@
 
 """Tests for config.pck imports."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestArchiveImport',
     'TestBasicImport',
+    'TestConvertToURI',
+    'TestFilterActionImport',
+    'TestMemberActionImport',
+    'TestPreferencesImport',
+    'TestRosterImport',
     ]
 
 
@@ -33,10 +35,6 @@ import unittest
 
 from datetime import timedelta, datetime
 from enum import Enum
-from pkg_resources import resource_filename
-from six.moves.cPickle import load
-from zope.component import getUtility
-
 from mailman.app.lifecycle import create_list
 from mailman.config import config
 from mailman.handlers.decorate import decorate
@@ -55,6 +53,9 @@ from mailman.testing.layers import ConfigLayer
 from mailman.utilities.filesystem import makedirs
 from mailman.utilities.importer import import_config_pck, Import21Error
 from mailman.utilities.string import expand
+from pkg_resources import resource_filename
+from six.moves.cPickle import load
+from zope.component import getUtility
 
 
 
diff --git a/src/mailman/utilities/tests/test_passwords.py b/src/mailman/utilities/tests/test_passwords.py
index 0dd49cb85..b11a7654b 100644
--- a/src/mailman/utilities/tests/test_passwords.py
+++ b/src/mailman/utilities/tests/test_passwords.py
@@ -17,9 +17,6 @@
 
 """Testing the password utility."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'TestPasswords',
     ]
diff --git a/src/mailman/utilities/tests/test_templates.py b/src/mailman/utilities/tests/test_templates.py
index 6507bf8e5..b59d2aa1c 100644
--- a/src/mailman/utilities/tests/test_templates.py
+++ b/src/mailman/utilities/tests/test_templates.py
@@ -17,10 +17,10 @@
 
 """Testing i18n template search and interpolation."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
+    'TestFind',
+    'TestMake',
+    'TestSearchOrder',
     ]
 
 
@@ -29,14 +29,13 @@ import shutil
 import tempfile
 import unittest
 
-from pkg_resources import resource_filename
-from zope.component import getUtility
-
 from mailman.app.lifecycle import create_list
 from mailman.config import config
 from mailman.interfaces.languages import ILanguageManager
 from mailman.testing.layers import ConfigLayer
 from mailman.utilities.i18n import TemplateNotFoundError, find, make, search
+from pkg_resources import resource_filename
+from zope.component import getUtility
 
 
 
@@ -191,14 +190,14 @@ class TestFind(unittest.TestCase):
             with open(path, 'w') as fp:
                 fp.write(text)
         self.xxsite = os.path.join(
-            self.var_dir, 'templates', 'site', 'xx', 'site.txt') 
+            self.var_dir, 'templates', 'site', 'xx', 'site.txt')
         write('Site template', self.xxsite)
-        self.xxdomain = os.path.join(        
-              self.var_dir, 'templates', 
+        self.xxdomain = os.path.join(
+              self.var_dir, 'templates',
               'domains', 'example.com', 'xx', 'domain.txt')
         write('Domain template', self.xxdomain)
         self.xxlist = os.path.join(
-              self.var_dir, 'templates', 
+              self.var_dir, 'templates',
               'lists', 'test@example.com', 'xx', 'list.txt')
         write('List template', self.xxlist)
 
diff --git a/src/mailman/utilities/tests/test_wrap.py b/src/mailman/utilities/tests/test_wrap.py
index eca6f93be..b9feeed92 100644
--- a/src/mailman/utilities/tests/test_wrap.py
+++ b/src/mailman/utilities/tests/test_wrap.py
@@ -17,10 +17,8 @@
 
 """Test text wrapping."""
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
+    'TestWrap',
     ]
 
 
diff --git a/src/mailman/utilities/uid.py b/src/mailman/utilities/uid.py
index 4fe862868..0b41b63c2 100644
--- a/src/mailman/utilities/uid.py
+++ b/src/mailman/utilities/uid.py
@@ -21,9 +21,6 @@ Use these functions to create unique ids rather than inlining calls to hashlib
 and whatnot.  These are better instrumented for testing purposes.
 """
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
 __all__ = [
     'UniqueIDFactory',
     'factory',
@@ -35,7 +32,6 @@ import uuid
 import errno
 
 from flufl.lock import Lock
-
 from mailman.config import config
 from mailman.model.uid import UID
 from mailman.testing import layers