merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -20,6 +20,7 @@ Fixed:
 - catch bad classname in URL (related to sf bug 1240541)
 - clean up digested_file_types (sf bug 1268303)
 - fix permission checks in mailgw (sf bug 1263655)
+- fix encoding of subject in generated error message (sf bug 1414465)
 
 
 2005-10-07 0.8.5

roundup/mailer.py

@@ -1,7 +1,7 @@
 """Sending Roundup-specific mail over SMTP.
 """
 __docformat__ = 'restructuredtext'
-# $Id: mailer.py,v 1.10.2.1 2006-01-13 03:34:34 richard Exp $
+# $Id: mailer.py,v 1.10.2.2 2006-01-27 02:42:05 richard Exp $
 
 import time, quopri, os, socket, smtplib, re
 
@@ -120,7 +120,7 @@ def bounce_message(self, bounced_message, to, error,
         part = writer.nextpart()
         part.addheader('Content-Transfer-Encoding', 'quoted-printable')
         body = part.startbody('text/plain; charset=utf-8')
-        body.write('\n'.join(error))
+        body.write(quopri.encodestring ('\n'.join(error)))
 
         # attach the original message to the returned message
         part = writer.nextpart()