Merge lp:~bjornt/publish-bot/non-ascii-message into lp:publish-bot

[Björn Tillenius]

Encode the message right before sending it.

Most of the message parts are unicode string, so better encode the whole
message instead of the individual parts.

Before this change things broke when trying to send the message, if any
of its parts contained non-ascii characters.

[Christopher Armstrong (radix)]

review: Approve

=== modified file 'bzrcommitmessage.py'
--- bzrcommitmessage.py	2007-03-20 23:39:57 +0000
+++ bzrcommitmessage.py	2013-04-03 13:43:36 +0000
@@ -8,7 +8,7 @@
 
     nickname = branch.get_config().get_nickname()
     if branch_prefix:
-        branch_prefix = branch_prefix.encode('utf-8')
+        branch_prefix = branch_prefix
         nickname = "%s/%s" % (branch_prefix, nickname)
     revision = branch.repository.get_revision(rev_id)
     message = ("%s r%d committed by %s\r\n%s"
@@ -24,7 +24,7 @@
         
     packit = ''
     for line in message.splitlines():
-        packit += '%s:#%s:%s\r\n' % (password, channel, line)
+        packit += '%s:#%s:%s\r\n' % (password, channel, line.encode('utf-8'))
     s.sendall(packit)
     s.close()