[kupu-checkins] r54941 - kupu/trunk/kupu/plone

[duncan at codespeak.net]

Author: duncan
Date: Mon May 19 16:24:49 2008
New Revision: 54941

Modified:
   kupu/trunk/kupu/plone/html2captioned.py
Log:
decodeEntites can be called with either unicode or str

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Mon May 19 16:24:49 2008
@@ -684,4 +684,6 @@
                     return unichr(name2codepoint[code])
         return match.group(0)
 
-    return EntityPattern.sub(unescape, s.decode(encoding))
+    if isinstance(s, str):
+        s = s.decode(encoding)
+    return EntityPattern.sub(unescape, s)