From 7881da0bc641bbe16a2e396636cc16856aef1901 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Tue, 11 Feb 2025 15:18:26 +0100 Subject: [PATCH] Python3 fixes: do not encode mail message components --- cco/member/browser.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cco/member/browser.py b/cco/member/browser.py index e4a79ee..c15f47c 100644 --- a/cco/member/browser.py +++ b/cco/member/browser.py @@ -122,9 +122,9 @@ class TanForm(LoginForm): target_language=lang) senderInfo = self.globalOptions('email.sender') sender = senderInfo and senderInfo[0] or 'info@loops.cy55.de' - sender = sender.encode('UTF-8') - msg = MIMEText(message.encode('UTF-8'), 'plain', 'UTF-8') - msg['Subject'] = subject.encode('UTF-8') + #sender = sender.encode('UTF-8') + msg = MIMEText(message, 'plain', 'UTF-8') + msg['Subject'] = subject msg['From'] = sender msg['To'] = ', '.join(recipients) mailhost = component.getUtility(IMailDelivery, 'Mail') @@ -316,8 +316,8 @@ class PasswordReset(PasswordChange): def sendPasswordResetMail(self, sender, recipients=[], subject='', message=''): - msg = MIMEText(message.encode('UTF-8'), 'html', 'UTF-8') - msg['Subject'] = subject.encode('UTF-8') + msg = MIMEText(message, 'html', 'UTF-8') + msg['Subject'] = subject msg['From'] = sender msg['To'] = ', '.join(recipients) mailhost = component.getUtility(IMailDelivery, 'Mail') @@ -390,7 +390,7 @@ class PasswordReset(PasswordChange): domain = self.request.getHeader('HTTP_HOST') senderInfo = self.globalOptions('email.sender') sender = senderInfo and senderInfo[0] or 'info@loops.cy55.de' - sender = sender.encode('UTF-8') + #sender = sender.encode('UTF-8') self.sendPasswordResetMail(sender, recipients, self.getSubject(), self.getMessage(token)) url = '%s?error_message=%s' % (self.url, self.reset_mail_message)