[kupu-checkins] r52723 - kupu/trunk/kupu/plone/kupu_plone_layer

[timte at codespeak.net]

Author: timte
Date: Wed Mar 19 15:39:27 2008
New Revision: 52723

Modified:
   kupu/trunk/kupu/plone/kupu_plone_layer/convertContentForKupu.py
Log:
If a formlib form is used in plone 2.5 kupu causes UnicodeDecodeError by trying str(content) when content is non-ascii unicode. A check for unicode is added.


Modified: kupu/trunk/kupu/plone/kupu_plone_layer/convertContentForKupu.py
==============================================================================
--- kupu/trunk/kupu/plone/kupu_plone_layer/convertContentForKupu.py	(original)
+++ kupu/trunk/kupu/plone/kupu_plone_layer/convertContentForKupu.py	Wed Mar 19 15:39:27 2008
@@ -13,6 +13,13 @@
 text_format = context.REQUEST.get('%s_text_format' % fieldname, context.getContentType(fieldname))
 
 if len(content)==0 or 'html' in text_format.lower():
+    if isinstance(content, unicode):
+        try:
+            encoding = context.getCharset()
+        except AttributeError:
+            encoding = 'utf8'
+        content = content.encode(encoding)
+
     return str(content)
 
 transforms = getToolByName(context, 'portal_transforms')