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

3 files changed, 7 insertions, 9 deletions

diff --git a/src/mailman/app/notifications.py b/src/mailman/app/notifications.py
index 1e8f1b820..fc8a0549e 100644
--- a/src/mailman/app/notifications.py
+++ b/src/mailman/app/notifications.py
@@ -35,7 +35,7 @@ from mailman.interfaces.member import DeliveryMode
 from mailman.interfaces.templates import ITemplateLoader
 from mailman.utilities.i18n import make
 from mailman.utilities.string import expand, wrap
-from six.moves.urllib_error import URLError
+from urllib.error import URLError
 from zope.component import getUtility
 
 
diff --git a/src/mailman/app/templates.py b/src/mailman/app/templates.py
index 4c4684523..86c61d046 100644
--- a/src/mailman/app/templates.py
+++ b/src/mailman/app/templates.py
@@ -27,11 +27,10 @@ from mailman.interfaces.languages import ILanguageManager
 from mailman.interfaces.listmanager import IListManager
 from mailman.interfaces.templates import ITemplateLoader
 from mailman.utilities.i18n import TemplateNotFoundError, find
-from six.moves.urllib_error import URLError
-from six.moves.urllib_parse import urlparse
-from six.moves.urllib_request import (
-    BaseHandler, build_opener, install_opener, urlopen)
-from six.moves.urllib_response import addinfourl
+from urllib.error import URLError
+from urllib.parse import urlparse
+from urllib.request import BaseHandler, build_opener, install_opener, urlopen
+from urllib.response import addinfourl
 from zope.component import getUtility
 from zope.interface import implementer
 
diff --git a/src/mailman/app/tests/test_templates.py b/src/mailman/app/tests/test_templates.py
index 880e3da90..7aab8f1f9 100644
--- a/src/mailman/app/tests/test_templates.py
+++ b/src/mailman/app/tests/test_templates.py
@@ -23,7 +23,6 @@ __all__ = [
 
 
 import os
-import six
 import shutil
 import tempfile
 import unittest
@@ -33,7 +32,7 @@ from mailman.config import config
 from mailman.interfaces.languages import ILanguageManager
 from mailman.interfaces.templates import ITemplateLoader
 from mailman.testing.layers import ConfigLayer
-from six.moves.urllib_error import URLError
+from urllib.error import URLError
 from zope.component import getUtility
 
 
@@ -132,5 +131,5 @@ class TestTemplateLoader(unittest.TestCase):
         with open(os.path.join(path, 'demo.txt'), 'wb') as fp:
             fp.write(test_text)
         content = self._loader.get('mailman:///it/demo.txt')
-        self.assertIsInstance(content, six.text_type)
+        self.assertIsInstance(content, str)
         self.assertEqual(content, test_text.decode('utf-8'))