Remove huge amounts of now unnecessary file boilerplate.

5 files changed, 18 insertions, 26 deletions

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',
     ]