From b857dba713786e05dc868c2d5ca2754daaeb3137 Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Fri, 26 Jan 2018 09:42:21 +0100 Subject: [PATCH] Fixed error with sending emails if recipient name contains non ascii chars. --- dav_events/emails.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dav_events/emails.py b/dav_events/emails.py index 703e437..0cf5932 100644 --- a/dav_events/emails.py +++ b/dav_events/emails.py @@ -32,7 +32,7 @@ def get_recipients(task, sport=None): else: raise ValueError('utils.get_recipients(): invalid value for task') - return ['{name} <{addr}>'.format(name=u.get_full_name(), addr=u.email) for u in users] + return [u'{name} <{addr}>'.format(name=u.get_full_name(), addr=u.email) for u in users] class AbstractMail(object): @@ -73,7 +73,7 @@ class AbstractMail(object): recipients = self._get_recipients() emo = EmailMessage(subject=subject, body=body, from_email=sender, to=recipients) - logger.info('Send %s to %s', self.__class__.__name__, recipients) + logger.info(u'Send %s to %s', self.__class__.__name__, recipients) emo.send() @@ -99,8 +99,8 @@ class NewEventMail(AbstractEventMail): return s def _get_recipients(self): - r = '{fullname} <{email}>'.format(fullname=self._event.owner.get_full_name(), - email=self._event.owner.email) + r = u'{fullname} <{email}>'.format(fullname=self._event.owner.get_full_name(), + email=self._event.owner.email) return [r] @@ -125,8 +125,8 @@ class EventAcceptedMail(AbstractEventMail): return s def _get_recipients(self): - r = '{fullname} <{email}>'.format(fullname=self._event.owner.get_full_name(), - email=self._event.owner.email) + r = u'{fullname} <{email}>'.format(fullname=self._event.owner.get_full_name(), + email=self._event.owner.email) return [r] @@ -151,8 +151,8 @@ class PasswordSetEmail(AbstractMail): self._password = password def _get_recipients(self): - r = '{fullname} <{email}>'.format(fullname=self._user.get_full_name(), - email=self._user.email) + r = u'{fullname} <{email}>'.format(fullname=self._user.get_full_name(), + email=self._user.email) return [r] def _get_context_data(self, extra_context=None):