Merge lp:~kaaloo/bzr-email-notifier/unicode-fix into lp:bzr-email-notifier

[Luis Arias]

Unmerged revisions

115. By Luis Arias <email address hidden> on 2012-01-24

Arguments to SMTP.sendmail need to conform to RFC822. Make sure they are ascii encoded.

=== modified file 'configuration.py'
--- configuration.py	2011-06-21 19:18:49 +0000
+++ configuration.py	2012-01-24 18:22:38 +0000
@@ -98,13 +98,13 @@
             address in the From header, and to_emails a list of all the
             addresses in the To, Cc, and Bcc headers.
         """
-        from_email = Utils.parseaddr(message.get('From', None))[1]
+        from_email = Utils.parseaddr(message.get('From', None))[1].encode('ascii', 'xmlcharrefreplace')
         to_full_addresses = []
         for header in ['To', 'Cc', 'Bcc']:
             value = message.get(header, None)
             if value:
                 to_full_addresses.append(value)
-        to_emails = [pair[1] for pair in
+        to_emails = [pair[1].encode('ascii', 'xmlcharrefreplace')  for pair in
                 Utils.getaddresses(to_full_addresses)]
 
         return from_email, to_emails
@@ -120,7 +120,7 @@
         try:
             self._connect()
             self._connection.sendmail(from_email, to_emails,
-                                      message.as_string())
+                                      message.as_string().encode('ascii', 'xmlcharrefreplace'))
         except (socket.error, smtplib.SMTPException), e:
             self.disconnect()
             raise SendEmailError(e)