openerp-dev-web team mailing list archive

["Ravindra Mekhiya\(OpenERP\)" <rme@xxxxxxxxxxx>]

Ravindra Mekhiya(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-730746-rme into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #730746 [6.0] wiki - difference - UNICODE Error
  https://bugs.launchpad.net/bugs/730746

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-730746-rme/+merge/52640

Hello,

-wiki : Accented character creating problem in 'Difference' wizard to show difference of changes occured in revisions.

Thanks.
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-730746-rme/+merge/52640
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-730746-rme.

=== modified file 'wiki/wiki.py'
--- wiki/wiki.py	2011-01-14 00:11:01 +0000
+++ wiki/wiki.py	2011-03-09 06:10:01 +0000
@@ -23,6 +23,7 @@
 from osv import fields, osv
 from tools.translate import _
 import difflib
+import tools
 
 class wiki_wiki(osv.osv):
     """ wiki """
@@ -229,9 +230,9 @@
         text2 = history_pool.read(cr, uid, [v2], ['text_area'])[0]['text_area']
         line1 = line2 = ''
         if text1:
-            line1 = text1.splitlines(1)
+            line1 = tools.ustr(text1.splitlines(1))
         if text2:
-            line2 = text2.splitlines(1)
+            line2=tools.ustr(text2.splitlines(1))
         if (not line1 and not line2) or (line1 == line2):
             raise osv.except_osv(_('Warning !'), _('There are no changes in revisions'))
         diff = difflib.HtmlDiff()