[Erp5-report] r38992 seb - /erp5/trunk/products/ERP5Type/patches/unicodeconflictresolver.py

[nobody at svn.erp5.org]

Author: seb
Date: Fri Oct  8 10:48:44 2010
New Revision: 38992

URL: http://svn.erp5.org?rev=38992&view=rev
Log:
some unicode error make sites unusable. Replace incorrect
utf-8 characters in order to give opportunity to fix them

Modified:
    erp5/trunk/products/ERP5Type/patches/unicodeconflictresolver.py

Modified: erp5/trunk/products/ERP5Type/patches/unicodeconflictresolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/unicodeconflictresolver.py?rev=38992&r1=38991&r2=38992&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/unicodeconflictresolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/unicodeconflictresolver.py [utf8] Fri Oct  8 10:48:44 2010
@@ -19,6 +19,8 @@
 # FOR A PARTICULAR PURPOSE
 ##############################################################################
 
+from zLOG import LOG
+import sys
 try:
   from Products.PageTemplates.unicodeconflictresolver \
        import PreferredCharsetResolver
@@ -30,5 +32,11 @@ else:
     # Since we use UTF-8 only in PageTemplate, it is enough here. It is
     # faster than the original implementation, and it is compatible with
     # requests that do not contain Accept-Charset header.
-    return unicode(text, 'utf-8', 'replace')
-  PreferredCharsetResolver.resolve = PreferredCharsetResolver_resolve
+    try:
+      result = unicode(text, 'utf-8')
+    except UnicodeDecodeError:
+      LOG('unicodeconflictresolver, Unicode Error', 0, text, 
+          error=sys.exc_info())
+      result = unicode(text, 'utf-8', 'replace')
+    return result
+  PreferredCharsetResolver.resolve = PreferredCharsetResolver_resolv