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

[duncan at codespeak.net]

Author: duncan
Date: Wed Mar  5 12:05:40 2008
New Revision: 52187

Modified:
   kupu/trunk/kupu/plone/html2captioned.py
Log:
Make html2char more robust

Modified: kupu/trunk/kupu/plone/html2captioned.py
==============================================================================
--- kupu/trunk/kupu/plone/html2captioned.py	(original)
+++ kupu/trunk/kupu/plone/html2captioned.py	Wed Mar  5 12:05:40 2008
@@ -670,6 +670,9 @@
             if code:
                 return unichr(int(code, 16))
             else:
-                return unichr(name2codepoint[match.group(3)])
+                code = match.group(3)
+                if code in name2codepoint:
+                    return unichr(name2codepoint[code])
+        return match.group(0)
 
-    return EntityPattern.sub(unescape, s)
+    return EntityPattern.sub(unescape, s.decode(encoding))