xrg has proposed merging lp:~openerp-dev/openobject-server/trunk-bug-795438-xrg
into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #795438 in OpenERP Server: "ir.values: whitespace cleaning, put
assertions on arg types"
https://bugs.launchpad.net/openobject-server/+bug/795438
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-795438-xrg/+merge/64129
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-795438-xrg/+merge/64129
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-bug-795438-xrg.
=== modified file 'openerp/addons/base/ir/ir_values.py'
--- openerp/addons/base/ir/ir_values.py 2011-05-25 15:17:22 +0000
+++ openerp/addons/base/ir/ir_values.py 2011-06-10 09:21:30 +0000
@@ -106,12 +106,13 @@
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 @@
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 @@
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)
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
