Merge lp:~mars/launchpad/fix-ec2-email-encoding into lp:launchpad

[Māris Fogels]

This branch fixes a UnicodeEncodeError raised by ec2test when using an email address that contains unicode characters.

This branch fixes a UnicodeEncodeError raised by ec2test when using an email address that contains unicode characters.

The fix encodes the unicode email address object to a UTF-8 binary string, which SFTP then handles correctly.

[Gary Poster (gary)]

[11:29am] gary_poster: mars, I'm guessing you have empirical proof it works?
[11:29am] mars: gary_poster, just a traceback from danilos sent to lp-dev. This same fix is present throughout the ec2test.py file.
[11:31am] mars: gary_poster, I have have danilos try it out before submitting to PQM
[11:32am] gary_poster: mars, alright. I have vague memories of pain with UTF in email headers and the stdlib email packages, but even if things don't get better, this shouldn't make anything worse (and hopefully it is a fix, of course!). Yes, would be happy if someone gave it a try before merging. Will approve with that condition, since you already have it planned.

review: Approve

=== modified file 'lib/devscripts/ec2test/testrunner.py'
--- lib/devscripts/ec2test/testrunner.py	2010-04-10 14:40:32 +0000
+++ lib/devscripts/ec2test/testrunner.py	2010-04-16 15:26:27 +0000
@@ -325,7 +325,7 @@
             bazaar_conf_file = user_connection.sftp.open(
                 ".bazaar/bazaar.conf", 'w')
             bazaar_conf_file.write(
-                'email = %s\n' % (self._from_email,))
+                'email = %s\n' % (self._from_email.encode('utf-8'),))
             bazaar_conf_file.write(
                 'smtp_server = %s\n' % (self._smtp_server,))
             if self._smtp_username: