core: support binary data in ZODB History View

It was failing decoding unicode

product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_getZODBHistoryList.py

@@ -8,7 +8,15 @@ if not getSecurityManager().getUser().has_permission('View History', context):
   raise Unauthorized()
 
 def beautifyChange(change_dict):
-  return ["%s:%s" % (k,change_dict[k]) for k in sorted(change_dict.keys())]
+  change_list = []
+  for property_name, property_value in sorted(change_dict.items()):
+    if isinstance(property_value, basestring):
+      try:
+        unicode(property_value, 'utf-8')
+      except UnicodeDecodeError:
+        property_value = '(binary)'
+    change_list.append('%s:%s' % (property_name, property_value))
+  return change_list
 
 try:
   history_size = portal.portal_preferences.getPreferredHtmlStyleZodbHistorySize()

product/ERP5/tests/testZODBHistory.py

@@ -28,6 +28,7 @@
 ##############################################################################
 
 import unittest
+import os
 
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 
@@ -144,6 +145,31 @@ class TestZODBHistory(ERP5TypeTestCase):
     from zExceptions import Unauthorized
     self.assertRaises(Unauthorized, document.Base_viewZODBHistory)
 
+  def test_ZODBHistoryBinaryData(self):
+    """
+     Make sure ZODB History view works with binary content
+    """
+    self.loginByUserName('tatuya')
+    document = self.addOrganisation(self.id()).newContent(
+        portal_type='Embedded File')
+
+    document.setFile(
+        open(os.path.join(
+          os.path.dirname(__file__),
+          'test_data',
+          'images',
+          'erp5_logo.png')))
+    document.setTitle("ロゴ")
+    self.commit()
+
+    # no encoding error
+    document.Base_viewZODBHistory()
+
+    change, = document.Base_getZODBHistoryList()
+    self.assertIn('data:(binary)', change.getProperty('changes'))
+    self.assertIn('content_type:image/png', change.getProperty('changes'))
+    self.assertIn('title:ロゴ', change.getProperty('changes'))
+
 
 def test_suite():
   suite = unittest.TestSuite()