diff options
Diffstat (limited to 'Mailman/Message.py')
| -rw-r--r-- | Mailman/Message.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Mailman/Message.py b/Mailman/Message.py index f79990837..e535b88cc 100644 --- a/Mailman/Message.py +++ b/Mailman/Message.py @@ -205,15 +205,14 @@ class UserNotification(Message): def __init__(self, recip, sender, subject=None, text=None, lang=None): Message.__init__(self) - charset = None + charset = 'us-ascii' if lang is not None: - csetstr = Utils.GetCharSet(lang) - charset = Charset(csetstr) + charset = Utils.GetCharSet(lang) if text is not None: - self.set_payload(text.encode(csetstr), charset) + self.set_payload(text.encode(charset), charset) if subject is None: subject = '(no subject)' - self['Subject'] = Header(subject.encode(csetstr), charset, + self['Subject'] = Header(subject.encode(charset), charset, header_name='Subject', errors='replace') self['From'] = sender if isinstance(recip, list): |