cco/loops-ext
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Python3 fixes: do not encode mail message components

Browse source
This commit is contained in:
Helmut Merz 2025-02-11 15:18:26 +01:00
parent f4774dfcfb
commit 7881da0bc6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cco/member/browser.py
View file

@ -122,9 +122,9 @@ class TanForm(LoginForm):
target_language=lang) target_language=lang)
senderInfo = self.globalOptions('email.sender') senderInfo = self.globalOptions('email.sender')
sender = senderInfo and senderInfo[0] or 'info@loops.cy55.de' sender = senderInfo and senderInfo[0] or 'info@loops.cy55.de'
sender = sender.encode('UTF-8') #sender = sender.encode('UTF-8')
msg = MIMEText(message.encode('UTF-8'), 'plain', 'UTF-8') msg = MIMEText(message, 'plain', 'UTF-8')
msg['Subject'] = subject.encode('UTF-8') msg['Subject'] = subject
msg['From'] = sender msg['From'] = sender
msg['To'] = ', '.join(recipients) msg['To'] = ', '.join(recipients)
mailhost = component.getUtility(IMailDelivery, 'Mail') mailhost = component.getUtility(IMailDelivery, 'Mail')
@ -316,8 +316,8 @@ class PasswordReset(PasswordChange):
def sendPasswordResetMail(self, sender, recipients=[], subject='', def sendPasswordResetMail(self, sender, recipients=[], subject='',
message=''): message=''):
msg = MIMEText(message.encode('UTF-8'), 'html', 'UTF-8') msg = MIMEText(message, 'html', 'UTF-8')
msg['Subject'] = subject.encode('UTF-8') msg['Subject'] = subject
msg['From'] = sender msg['From'] = sender
msg['To'] = ', '.join(recipients) msg['To'] = ', '.join(recipients)
mailhost = component.getUtility(IMailDelivery, 'Mail') mailhost = component.getUtility(IMailDelivery, 'Mail')
@ -390,7 +390,7 @@ class PasswordReset(PasswordChange):
domain = self.request.getHeader('HTTP_HOST') domain = self.request.getHeader('HTTP_HOST')
senderInfo = self.globalOptions('email.sender') senderInfo = self.globalOptions('email.sender')
sender = senderInfo and senderInfo[0] or 'info@loops.cy55.de' 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.sendPasswordResetMail(sender, recipients, self.getSubject(),
self.getMessage(token)) self.getMessage(token))
url = '%s?error_message=%s' % (self.url, self.reset_mail_message) url = '%s?error_message=%s' % (self.url, self.reset_mail_message)