[Erp5-report] r39613 kazuhiko - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Oct 28 15:53:03 CEST 2010
Author: kazuhiko
Date: Thu Oct 28 15:53:02 2010
New Revision: 39613
URL: http://svn.erp5.org?rev=39613&view=rev
Log:
we don't care UnicodeDecodeError in getting old object XML, otherwise we cannot update erp5_xhtml_style business template with r39494 change.
Modified:
erp5/trunk/products/ERP5/Document/BusinessTemplate.py
Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=39613&r1=39612&r2=39613&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Thu Oct 28 15:53:02 2010
@@ -869,7 +869,8 @@ class ObjectTemplateItem(BaseTemplateIte
try:
OFS.XMLExportImport.exportXML(old_object._p_jar, old_object._p_oid, old_io)
old_obj_xml = old_io.getvalue()
- except ImportError, e: # module is already removed etc.
+ except (ImportError, UnicodeDecodeError), e: # module is already
+ # removed etc.
old_obj_xml = '(%s: %s)' % (e.__class__.__name__, e)
new_io.close()
old_io.close()
More information about the Erp5-report
mailing list