[Erp5-report] r38896 kazuhiko - /erp5/trunk/products/ERP5Type/patches/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Oct  5 15:47:55 2010
New Revision: 38896

URL: http://svn.erp5.org?rev=38896&view=rev
Log:
add 'replace' argument to unicode(), because we can have non-valid characters in error_log (in proxy field caches) for example.

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=38896&r1=38895&r2=38896&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/unicodeconflictresolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/unicodeconflictresolver.py [utf8] Tue Oct  5 15:47:55 2010
@@ -30,5 +30,5 @@ 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')
+    return unicode(text, 'utf-8', 'replace')
   PreferredCharsetResolver.resolve = PreferredCharsetResolver_resolve