From d9943ea49bd16d3efdb7270df33cca158123aa8a Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Mon, 27 Jan 2014 15:58:48 +0100 Subject: [PATCH] [IMP] website: make code more robust bzr revid: rco@openerp.com-20140127145848-ib7jlhb1c6aw3w2d --- addons/website/models/ir_ui_view.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py index ad6e98de5fb..303691b7f42 100644 --- a/addons/website/models/ir_ui_view.py +++ b/addons/website/models/ir_ui_view.py @@ -28,14 +28,15 @@ class view(osv.osv): stack_result = [] def view_obj(view): - if type(view) in (str, unicode): + if isinstance(view, basestring): mod_obj = self.pool.get("ir.model.data") m, n = view.split('.') _, view = mod_obj.get_object_reference(cr, uid, m, n) - if type(view) == int: + elif isinstance(view, (int, long)): view_obj = self.pool.get("ir.ui.view") view = view_obj.browse(cr, uid, view, context=context) return view + try: view = view_obj(view) except ValueError: