From 7bea08c745c97e0b2fb2b5f7780ec22494685e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 5 Mar 2013 10:28:11 +0100 Subject: [PATCH] Fix coding for StringMatcher in global_search StringMatcher requires to have the same type of strings issue3029 review696002 --- trytond/ir/model.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/trytond/ir/model.py b/trytond/ir/model.py index 0558b967c0..8c0eb27cf3 100644 --- a/trytond/ir/model.py +++ b/trytond/ir/model.py @@ -134,7 +134,9 @@ class Model(ModelSQL, ModelView): ]) access = ModelAccess.get_access([m.model for m in models]) s = StringMatcher() - s.set_seq2(text.decode('utf-8')) + if isinstance(text, str): + text = text.decode('utf-8') + s.set_seq2(text) def generate(): for model in models: @@ -144,6 +146,8 @@ class Model(ModelSQL, ModelView): if not hasattr(Model, 'search_global'): continue for id_, rec_name, icon in Model.search_global(text): + if isinstance(rec_name, str): + rec_name = rec_name.decode('utf-8') s.set_seq1(rec_name) yield (s.ratio(), model.model, model.rec_name, id_, rec_name, icon)