From 13d3c639fa9993ae1874149b9e5b60fde7470f3e Mon Sep 17 00:00:00 2001 From: "RME (OpenERP)" Date: Wed, 9 Mar 2011 11:38:47 +0530 Subject: [PATCH] [FIX] wiki : Accented character creating problem in 'Difference' wizard to show difference of changes occured in revisions lp bug: https://launchpad.net/bugs/730746 fixed bzr revid: rme@tinyerp.com-20110309060847-4kuh78sr7uzznfye --- addons/wiki/wiki.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py index 2236f1f69ce..940d7116099 100644 --- a/addons/wiki/wiki.py +++ b/addons/wiki/wiki.py @@ -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 @@ class wiki_history(osv.osv): 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()