summaryrefslogtreecommitdiff
path: root/src/mailman/utilities/i18n.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/mailman/utilities/i18n.py')
-rw-r--r--src/mailman/utilities/i18n.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mailman/utilities/i18n.py b/src/mailman/utilities/i18n.py
index e22bd6c18..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',
@@ -29,17 +26,17 @@ __all__ = [
import os
+import six
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
@@ -203,7 +200,8 @@ def make(template_file, mlist=None, language=None, wrap=True,
template = _(fp.read()[:-1])
finally:
fp.close()
- assert isinstance(template, unicode), 'Translated template is not unicode'
+ assert isinstance(template, six.text_type), (
+ 'Translated template is not unicode')
text = expand(template, kw)
if wrap:
return wrap_text(text)