[Erp5-report] r39278 leonardo - /erp5/trunk/products/ERP5Type/patches/

[nobody at svn.erp5.org]

Author: leonardo
Date: Mon Oct 18 14:29:51 2010
New Revision: 39278

URL: http://svn.erp5.org?rev=39278&view=rev
Log:
better info about unicode encoding errors

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=39278&r1=39277&r2=39278&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/unicodeconflictresolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/unicodeconflictresolver.py [utf8] Mon Oct 18 14:29:51 2010
@@ -19,8 +19,10 @@
 # FOR A PARTICULAR PURPOSE
 ##############################################################################
 
-from zLOG import LOG
-import sys
+from logging import getLogger
+import traceback
+logger = getLogger(__name__)
+
 try:
   from Products.PageTemplates.unicodeconflictresolver \
        import PreferredCharsetResolver
@@ -34,9 +36,11 @@ else:
     # requests that do not contain Accept-Charset header.
     try:
       result = unicode(text, 'utf-8')
-    except UnicodeDecodeError:
-      LOG('unicodeconflictresolver, Unicode Error', 0, text, 
-          error=sys.exc_info())
+    except UnicodeDecodeError, e:
+      tb_info = ''.join(traceback.format_stack())
+      logger.warn('UnicodeDecodeError: %s\ntext: %r\nat:\n%s' %
+                  (e, text, tb_info))
       result = unicode(text, 'utf-8', 'replace')
     return result
   PreferredCharsetResolver.resolve = PreferredCharsetResolver_resolve
+