MailManager/Extensions TicketPluggableBrain.py,1.6.2.8,1.6.2.9

[Graeme M. <ma...@us...>]

Update of /cvsroot/mailmanager/MailManager/Extensions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11262/Extensions

Modified Files:
      Tag: RELENG_2_0_1
	TicketPluggableBrain.py 
Log Message:
All messages are now sent out as UTF-8, in both the text/html portions and
the text/plain portions.  Hallelujah!  It got to 'board-shuffling' towards
the end, though, so I'm not convinced I'm happy with the yet.


Index: TicketPluggableBrain.py
===================================================================
RCS file: /cvsroot/mailmanager/MailManager/Extensions/TicketPluggableBrain.py,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -u -d -r1.6.2.8 -r1.6.2.9
--- TicketPluggableBrain.py	23 Dec 2005 23:39:35 -0000	1.6.2.8
+++ TicketPluggableBrain.py	19 Jan 2006 16:05:55 -0000	1.6.2.9
@@ -14,9 +14,11 @@
 except ImportError:
     pass
 try:
-    from stripogram import html2text, html2safehtml
+    from stripogram import html2safehtml
 except ImportError:
-    from Products.stripogram import html2text, html2safehtml
+    from Products.stripogram import html2safehtml
+
+from Products.MailManager.support.html2text import html2text
 
 # Python library modules.
 import re
@@ -527,7 +529,7 @@
         if body_is_html and not body_was_html:
             body = self._makeHTML(body)
         if not body_is_html and body_was_html:
-            body = html2text(body, ('script', 'noscript', 'style'))
+            body = html2text(body)
         # Reset template_name.
         template_name = '%s_%s' % (template_name,
                                    body_is_html and 'html' or 'plain')