We don't need the 'six' package any more.

3 files changed, 4 insertions, 7 deletions

diff --git a/src/mailman/utilities/i18n.py b/src/mailman/utilities/i18n.py
index 8f6f27af4..1d3fbca6f 100644
--- a/src/mailman/utilities/i18n.py
+++ b/src/mailman/utilities/i18n.py
@@ -26,7 +26,6 @@ __all__ = [
 
 
 import os
-import six
 import sys
 import errno
 
@@ -200,8 +199,7 @@ def make(template_file, mlist=None, language=None, wrap=True,
         template = _(fp.read()[:-1])
     finally:
         fp.close()
-    assert isinstance(template, six.text_type), (
-        'Translated template is not unicode')
+    assert isinstance(template, str), 'Translated template is not a string'
     text = expand(template, kw)
     if wrap:
         return wrap_text(text)
diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py
index 46140f282..8590d9b1b 100644
--- a/src/mailman/utilities/importer.py
+++ b/src/mailman/utilities/importer.py
@@ -45,7 +45,7 @@ from mailman.interfaces.nntp import NewsgroupModeration
 from mailman.interfaces.usermanager import IUserManager
 from mailman.utilities.filesystem import makedirs
 from mailman.utilities.i18n import search
-from six.moves.urllib_error import URLError
+from urllib.error import URLError
 from zope.component import getUtility
 
 
diff --git a/src/mailman/utilities/tests/test_import.py b/src/mailman/utilities/tests/test_import.py
index 68a02c720..b0ab9938d 100644
--- a/src/mailman/utilities/tests/test_import.py
+++ b/src/mailman/utilities/tests/test_import.py
@@ -29,7 +29,6 @@ __all__ = [
 
 
 import os
-import six
 import mock
 import unittest
 
@@ -53,8 +52,8 @@ 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 pickle import load
 from pkg_resources import resource_filename
-from six.moves.cPickle import load
 from zope.component import getUtility
 
 
@@ -189,7 +188,7 @@ class TestBasicImport(unittest.TestCase):
         # moderator_password must not be unicode
         self._pckdict['mod_password'] = b'TESTVALUE'
         self._import()
-        self.assertNotIsInstance(self._mlist.moderator_password, six.text_type)
+        self.assertNotIsInstance(self._mlist.moderator_password, str)
         self.assertEqual(self._mlist.moderator_password, b'TESTVALUE')
 
     def test_newsgroup_moderation(self):