summaryrefslogtreecommitdiff
path: root/src/mailman/app/notifications.py
diff options
context:
space:
mode:
authorBarry Warsaw2015-01-04 20:20:33 -0500
committerBarry Warsaw2015-01-04 20:20:33 -0500
commit4a612db8e89afed74173b93f3b64fa567b8417a3 (patch)
tree81a687d113079a25f93279f35c7eee2aa2572510 /src/mailman/app/notifications.py
parent84af79988a4e916604cba31843778206efb7d1b8 (diff)
parentde181c1a40965a3a7deedd56a034a946f45b6984 (diff)
downloadmailman-4a612db8e89afed74173b93f3b64fa567b8417a3.tar.gz
mailman-4a612db8e89afed74173b93f3b64fa567b8417a3.tar.zst
mailman-4a612db8e89afed74173b93f3b64fa567b8417a3.zip
Diffstat (limited to 'src/mailman/app/notifications.py')
-rw-r--r--src/mailman/app/notifications.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mailman/app/notifications.py b/src/mailman/app/notifications.py
index 1fa1fe01e..163b02653 100644
--- a/src/mailman/app/notifications.py
+++ b/src/mailman/app/notifications.py
@@ -17,9 +17,6 @@
"""Sending notifications."""
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
__all__ = [
'send_admin_subscription_notice',
'send_goodbye_message',
@@ -31,9 +28,6 @@ import logging
from email.utils import formataddr
from lazr.config import as_boolean
-from urllib2 import URLError
-from zope.component import getUtility
-
from mailman.config import config
from mailman.core.i18n import _
from mailman.email.message import OwnerNotification, UserNotification
@@ -41,6 +35,8 @@ 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 zope.component import getUtility
log = logging.getLogger('mailman.error')
@@ -141,7 +137,6 @@ def send_admin_subscription_notice(mlist, address, display_name, language):
"""
with _.using(mlist.preferred_language.code):
subject = _('$mlist.display_name subscription notification')
- display_name = display_name.encode(language.charset, 'replace')
text = make('adminsubscribeack.txt',
mailing_list=mlist,
listname=mlist.display_name,