From 2e88574a57257581ae0464e6787fef46044782e9 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 7 Aug 2013 11:00:54 +0200 Subject: [PATCH 01/14] [IMP] res.partner: add us country for demo data bzr revid: chm@openerp.com-20130807090054-5sa1vst28w9exenw --- openerp/addons/base/base_demo.xml | 1 + openerp/tools/qweb.py | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml index 5fb6e94eecc..7cc5acf2c0f 100644 --- a/openerp/addons/base/base_demo.xml +++ b/openerp/addons/base/base_demo.xml @@ -14,6 +14,7 @@ 1725 Slough Ave. Scranton 18540 + +1 555 123 8069 info@example.com www.example.com diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py index cc93df61208..9194538d3aa 100644 --- a/openerp/tools/qweb.py +++ b/openerp/tools/qweb.py @@ -288,9 +288,6 @@ class QWebXml(object): if field_type == 'many2one': field_data = record.read([field])[0].get(field) inner = field_data and field_data[1] or "" - #field = getattr(record, field) - #if field: - # inner = field.name_get()[0][1] or "" else: inner = getattr(record, field) or "" if isinstance(inner, types.UnicodeType): From 89a6d2744c5e1be50b0fdbb41289c0c6631e9b64 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 7 Aug 2013 15:39:39 +0200 Subject: [PATCH 02/14] [FIX] make QWeb usable in standalone mode bzr revid: fme@openerp.com-20130807133939-3c2jxg5btjj8d2rq --- openerp/tools/qweb.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py index 9194538d3aa..ca073079048 100644 --- a/openerp/tools/qweb.py +++ b/openerp/tools/qweb.py @@ -69,7 +69,7 @@ class QWebXml(object): """ - def __init__(self, loader): + def __init__(self, loader=None): self.loader = loader self.node = xml.dom.Node self._t = {} @@ -104,7 +104,7 @@ class QWebXml(object): def get_template(self, name): if name in self._t: return self._t[name] - else: + elif self.loader: xml = self.loader(name) self.add_template(xml) if name in self._t: From 83055fb9045cc9c62e9b70a8e5254ce14133f7d9 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 8 Aug 2013 10:07:42 +0200 Subject: [PATCH 03/14] [IMP] pynazilint bzr revid: fme@openerp.com-20130808080742-do371111f1rmq3n0 --- openerp/tools/qweb.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py index ca073079048..7d789e4cdce 100644 --- a/openerp/tools/qweb.py +++ b/openerp/tools/qweb.py @@ -74,8 +74,8 @@ class QWebXml(object): self.node = xml.dom.Node self._t = {} self._render_tag = {} - self._void_elements = set(['area','base','br','col','embed','hr','img','input','keygen', - 'link','menuitem','meta','param','source','track','wbr']); + self._void_elements = set(['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', + 'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr']) prefix = 'render_tag_' for i in [j for j in dir(self) if j.startswith(prefix)]: name = i[len(prefix):].replace('_', '-') @@ -203,19 +203,19 @@ class QWebXml(object): # Tags def render_tag_raw(self, e, t_att, g_att, v): inner = self.eval_str(t_att["raw"], v) - return self.render_element(e, t_att, g_att, v, inner) + return self.render_element(e, t_att, g_att, v, inner) def render_tag_rawf(self, e, t_att, g_att, v): inner = self.eval_format(t_att["rawf"], v) - return self.render_element(e, t_att, g_att, v, inner) + return self.render_element(e, t_att, g_att, v, inner) def render_tag_esc(self, e, t_att, g_att, v): inner = cgi.escape(self.eval_str(t_att["esc"], v)) - return self.render_element(e, t_att, g_att, v, inner) + return self.render_element(e, t_att, g_att, v, inner) def render_tag_escf(self, e, t_att, g_att, v): inner = cgi.escape(self.eval_format(t_att["escf"], v)) - return self.render_element(e, t_att, g_att, v, inner) + return self.render_element(e, t_att, g_att, v, inner) def render_tag_foreach(self, e, t_att, g_att, v): expr = t_att["foreach"] @@ -307,6 +307,6 @@ class QWebXml(object): except AttributeError: _logger.warning("t-field no field %s for model %s", field, record._model._name) - return self.render_element(e, t_att, g_att, v, str(inner)) + return self.render_element(e, t_att, g_att, v, str(inner)) # leave this, al. From 2d4452c2daf368fcd3eb4fdf8a9014b8a79ddc93 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 8 Aug 2013 20:11:38 +0200 Subject: [PATCH 04/14] [FIX] QWeb expression evaluation + undefined variable management WIP bzr revid: fme@openerp.com-20130808181138-klb1hs9cfsvzrle4 --- openerp/tools/qweb.py | 97 ++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 47 deletions(-) diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py index 7d789e4cdce..441f72d4c10 100644 --- a/openerp/tools/qweb.py +++ b/openerp/tools/qweb.py @@ -1,5 +1,6 @@ import cgi import logging +import re import types #from openerp.tools.safe_eval import safe_eval as eval @@ -9,49 +10,23 @@ import xml.dom.minidom _logger = logging.getLogger(__name__) -class QWebEval(object): - def __init__(self, data): - self.data = data +class QWebContext(dict): + def __init__(self, data, undefined_handler=None): + self.undefined_handler = undefined_handler + dict.__init__(self, data) + self['defined'] = lambda key: key in self - def __getitem__(self, expr): - if expr in self.data: - return self.data[expr] - r = '' - try: - r = eval(expr, self.data) - except NameError: - pass - except AttributeError: - pass - except Exception: - _logger.exception('invalid expression: %r', expr) - - self.data.pop('__builtins__', None) - return r - - def eval_object(self, expr): - return self[expr] - - def eval_str(self, expr): - if expr == "0": - return self.data.get(0, '') - if isinstance(self[expr], unicode): - return self[expr].encode("utf8") - return str(self[expr]) - - def eval_format(self, expr): - try: - return str(expr % self) - except: - return "qweb: format error '%s' " % expr -# if isinstance(r,unicode): -# return r.encode("utf8") - - def eval_bool(self, expr): - if self.eval_object(expr): - return 1 + def __getitem__(self, key): + if key in self: + return self.get(key) + # Last minute change, this is WIP, do not remove. + # + # elif not self.undefined_handler: + # raise NameError("QWeb: name %r is not defined while rendering template %r" % (key, self.get('__template__'))) + # else: + # return self.get(key, self.undefined_handler(key, self)) else: - return 0 + return None class QWebXml(object): """QWeb Xml templating engine @@ -74,6 +49,7 @@ class QWebXml(object): self.node = xml.dom.Node self._t = {} self._render_tag = {} + self._format_regex = re.compile('#\{(.*?)\}') self._void_elements = set(['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen', 'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr']) prefix = 'render_tag_' @@ -111,21 +87,48 @@ class QWebXml(object): return self._t[name] raise KeyError('qweb: template "%s" not found' % name) + def eval(self, expr, v): + try: + return eval(expr, None, v) + except Exception: + raise SyntaxError("QWeb: invalid expression %r while rendering template '%s'" % (expr, v.get('__template__'))) + def eval_object(self, expr, v): - return QWebEval(v).eval_object(expr) + return self.eval(expr, v) def eval_str(self, expr, v): - return QWebEval(v).eval_str(expr) + if expr == "0": + return v.get(0, '') + val = self.eval(expr, v) + if isinstance(val, unicode): + return val.encode("utf8") + return str(val) def eval_format(self, expr, v): - return QWebEval(v).eval_format(expr) + use_native = True + for m in self._format_regex.finditer(expr): + use_native = False + expr = expr.replace(m.group(), self.eval(m.groups()[0], v)) + if not use_native: + return expr + else: + try: + return str(expr % v) + except: + raise Exception("QWeb: format error '%s' " % expr) def eval_bool(self, expr, v): - return QWebEval(v).eval_bool(expr) + val = self.eval(expr, v) + if val: + return 1 + else: + return 0 def render(self, tname, v=None, out=None): if v is None: v = {} + v['__template__'] = tname + v = QWebContext(v) return self.render_node(self.get_template(tname), v) def render_node(self, e, v): @@ -222,7 +225,7 @@ class QWebXml(object): enum = self.eval_object(expr, v) if enum is not None: var = t_att.get('as', expr).replace('.', '_') - d = v.copy() + d = QWebContext(v.copy()) size = -1 if isinstance(enum, types.ListType): size = len(enum) @@ -265,7 +268,7 @@ class QWebXml(object): if "import" in t_att: d = v else: - d = v.copy() + d = QWebContext(v.copy()) d[0] = self.render_element(e, t_att, g_att, d) return self.render(t_att["call"], d) From a467b2d0efbba5c029ac748e3b0986fb5e9dae18 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 8 Aug 2013 20:22:18 +0200 Subject: [PATCH 05/14] [IMP] Qweb, use undefined handler bzr revid: fme@openerp.com-20130808182218-3a9vb97gx49alyzz --- openerp/addons/base/ir/ir_ui_view.py | 2 +- openerp/tools/qweb.py | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index 4743b6888da..6116d6b19ac 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -746,7 +746,7 @@ class view(osv.osv): arch = '%s' % (arch) return arch - engine = qweb.QWebXml(loader) + engine = qweb.QWebXml(loader=loader, undefined_handler=lambda key, v: None) return engine.render(id_or_xml_id, values) # maybe used to print the workflow ? diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py index 441f72d4c10..e7f46ea6ba6 100644 --- a/openerp/tools/qweb.py +++ b/openerp/tools/qweb.py @@ -19,14 +19,10 @@ class QWebContext(dict): def __getitem__(self, key): if key in self: return self.get(key) - # Last minute change, this is WIP, do not remove. - # - # elif not self.undefined_handler: - # raise NameError("QWeb: name %r is not defined while rendering template %r" % (key, self.get('__template__'))) - # else: - # return self.get(key, self.undefined_handler(key, self)) + elif not self.undefined_handler: + raise NameError("QWeb: name %r is not defined while rendering template %r" % (key, self.get('__template__'))) else: - return None + return self.get(key, self.undefined_handler(key, self)) class QWebXml(object): """QWeb Xml templating engine @@ -44,8 +40,9 @@ class QWebXml(object): """ - def __init__(self, loader=None): + def __init__(self, loader=None, undefined_handler=None): self.loader = loader + self.undefined_handler = undefined_handler self.node = xml.dom.Node self._t = {} self._render_tag = {} @@ -128,7 +125,7 @@ class QWebXml(object): if v is None: v = {} v['__template__'] = tname - v = QWebContext(v) + v = QWebContext(v, self.undefined_handler) return self.render_node(self.get_template(tname), v) def render_node(self, e, v): @@ -225,7 +222,7 @@ class QWebXml(object): enum = self.eval_object(expr, v) if enum is not None: var = t_att.get('as', expr).replace('.', '_') - d = QWebContext(v.copy()) + d = QWebContext(v.copy(), self.undefined_handler) size = -1 if isinstance(enum, types.ListType): size = len(enum) @@ -268,7 +265,7 @@ class QWebXml(object): if "import" in t_att: d = v else: - d = QWebContext(v.copy()) + d = QWebContext(v.copy(), self.undefined_handler) d[0] = self.render_element(e, t_att, g_att, d) return self.render(t_att["call"], d) From cc3ef85dd76c78874884a0b8fc3158bd999596cc Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Fri, 9 Aug 2013 00:39:38 +0200 Subject: [PATCH 06/14] [WIP] eval globals - will check safe_eval later bzr revid: fme@openerp.com-20130808223938-5sp7vrnejmxtg7j6 --- openerp/tools/qweb.py | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py index e7f46ea6ba6..ce5958370c7 100644 --- a/openerp/tools/qweb.py +++ b/openerp/tools/qweb.py @@ -13,7 +13,29 @@ _logger = logging.getLogger(__name__) class QWebContext(dict): def __init__(self, data, undefined_handler=None): self.undefined_handler = undefined_handler - dict.__init__(self, data) + d = { + 'True': True, + 'False': False, + 'None': None, + 'str': str, + 'globals': locals, + 'locals': locals, + 'bool': bool, + 'dict': dict, + 'list': list, + 'tuple': tuple, + 'map': map, + 'abs': abs, + 'min': min, + 'max': max, + 'reduce': reduce, + 'filter': filter, + 'round': round, + 'len': len, + 'set': set + } + d.update(data) + dict.__init__(self, d) self['defined'] = lambda key: key in self def __getitem__(self, key): @@ -105,7 +127,7 @@ class QWebXml(object): use_native = True for m in self._format_regex.finditer(expr): use_native = False - expr = expr.replace(m.group(), self.eval(m.groups()[0], v)) + expr = expr.replace(m.group(), self.eval_str(m.groups()[0], v)) if not use_native: return expr else: @@ -272,6 +294,8 @@ class QWebXml(object): def render_tag_set(self, e, t_att, g_att, v): if "value" in t_att: v[t_att["set"]] = self.eval_object(t_att["value"], v) + elif "valuef" in t_att: + v[t_att["set"]] = self.eval_format(t_att["valuef"], v) else: v[t_att["set"]] = self.render_element(e, t_att, g_att, v) return "" From 14e555d920a581b97f7c031b727333357b07e466 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sat, 10 Aug 2013 15:24:49 +0200 Subject: [PATCH 07/14] [IMP] support for inherit_option_id,