[Erp5-report] r32139 jerome - /erp5/trunk/products/CMFActivity/ActivityTool.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Feb  1 14:23:31 2010
New Revision: 32139

URL: http://svn.erp5.org?rev=32139&view=rev
Log:
__traceback_info__ can turn the tracebacks into unicode strings, but
MailHost.send (in Zope 2.8) will not be able to parse headers if the mail_text
is passed as a unicode. In such case, convert to string explicitly.


Modified:
    erp5/trunk/products/CMFActivity/ActivityTool.py

Modified: erp5/trunk/products/CMFActivity/ActivityTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActivityTool.py?rev=32139&r1=32138&r2=32139&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActivityTool.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/ActivityTool.py [utf8] Mon Feb  1 14:23:31 2010
@@ -342,6 +342,12 @@
        activity_tool.getCurrentNode(), self.user_name,
        '/'.join(self.object_path), self.method_id, self.args, self.kw,
        call_traceback, self.exc_type, self.exc_value, self.traceback)
+
+    if isinstance(mail_text, unicode):
+      # __traceback_info__ can turn the tracebacks into unicode strings, but
+      # MailHost.send (in Zope 2.8) will not be able to parse headers if the
+      # mail_text is passed as a unicode.
+      mail_text = mail_text.encode('utf8')
     try:
       activity_tool.MailHost.send( mail_text )
     except (socket.error, MailHostError), message: