From ba03d853251fb93ad74af39d673dfe414cf14479 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Fri, 10 Jun 2011 12:18:52 +0300 Subject: [PATCH] ir.values: whitespace cleaning, put assertions on arg types res.lang was calling with modules='string', which was not right. Don't allow such a case. bzr revid: xrg@linux.gr-20110610091852-y8083s085gn6kwcs --- openerp/addons/base/ir/ir_values.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py index b2a203a0e1e..4a78bfca273 100644 --- a/openerp/addons/base/ir/ir_values.py +++ b/openerp/addons/base/ir/ir_values.py @@ -106,12 +106,13 @@ class ir_values(osv.osv): value = pickle.dumps(value) if meta: meta = pickle.dumps(meta) + assert isinstance(models, (tuple, list)), models ids_res = [] for model in models: if isinstance(model, (list, tuple)): model,res_id = model else: - res_id=False + res_id = False if replace: search_criteria = [ ('key', '=', key), @@ -148,11 +149,13 @@ class ir_values(osv.osv): if context is None: context = {} result = [] + assert isinstance(models, (list, tuple)), models + for m in models: if isinstance(m, (list, tuple)): m, res_id = m else: - res_id=False + res_id = False where = ['key=%s','model=%s'] params = [key, str(m)] @@ -161,7 +164,7 @@ class ir_values(osv.osv): params.append(key2[:200]) elif key2_req and not meta: where.append('key2 is null') - if res_id_req and (models[-1][0]==m): + if res_id_req and (models[-1][0] == m): if res_id: where.append('res_id=%s') params.append(res_id)