bzr commit into mysql_plugins branch (joerg:127)

[Joerg Bruehe]

#At file:///home/joerg/.bazaar/plugins/mysql_plugins/

  127 Joerg Bruehe	2008-07-02 [merge]
      Another merge from central.
modified:
  emailer.py

=== modified file 'emailer.py'
--- a/emailer.py	2008-06-28 11:13:32 +0000
+++ b/emailer.py	2008-07-01 19:11:38 +0000
@@ -396,7 +396,7 @@ class CommitSender(EmailSender):
         self.show_diff_trees_minus_p(tree_old, tree_new, diff_content)
         numlines = diff_content.getvalue().count('\n')+1
         if numlines <= difflimit:
-            return diff_content.getvalue().decode(self.encoding)
+            return diff_content.getvalue().decode(self.encoding, 'replace')
         else:
             return (u"\nDiff too large for email"
                     u" (%d lines, the limit is %d).\n"
@@ -432,7 +432,7 @@ class CommitSender(EmailSender):
             outf.write(self.per_file_messages_as_string(self.revision))
 
             # Decode the stuff planned for output to get Unicode.
-            self._body = outf.getvalue().decode(self.encoding)
+            self._body = outf.getvalue().decode(self.encoding, 'replace')
 
         assert isinstance(self._body, unicode)
         return self._body
@@ -475,7 +475,7 @@ class PushSender(EmailSender):
                          start_revision=self.old_revno,
                          end_revision=self.new_revno)
 
-            self._body = outf.getvalue().decode(self.encoding)
+            self._body = outf.getvalue().decode(self.encoding, 'replace')
             note("Sending post-push message")
 
         assert isinstance(self._body, unicode)
@@ -496,7 +496,7 @@ class PushSender(EmailSender):
             self.show_diff_trees_minus_p(tree_old, tree_new, diff_content)
             numlines = diff_content.getvalue().count('\n')+1
             if numlines <= difflimit:
-                self._diff = diff_content.getvalue().decode(self.encoding)
+                self._diff = diff_content.getvalue().decode(self.encoding, 'replace')
             else:
                 self._diff = (u"\nDiff too large for email"
                               u" (%d lines, the limit is %d).\n"