odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REV] Bring back QWebException, rename QWebException#inner to 'cause' 

bzr revid: fme@openerp.com-20140131113515-ahcix3h6uzzdz8ix
This commit is contained in:
Fabien Meghazi 2014-01-31 12:35:15 +01:00
parent 54dff0857d
commit fa61a1e5a7
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
openerp/addons/base/ir/ir_qweb.py
View File

@ -24,18 +24,27 @@ _logger = logging.getLogger(__name__)
#--------------------------------------------------------------------
# QWeb template engine
#--------------------------------------------------------------------
class QWebException(Exception):
def __init__(self, message, template=None, node=None, expression=None, inner=None):
def __init__(self, message, **kw):
Exception.__init__(self, message)
self.template = template
self.node = node
self.expression = expression
self.inner = inner
self.qweb = dict(kw)
class QWebTemplateNotFound(QWebException):
pass
def convert_to_qweb_exception(etype=None, **kw):
if etype is None:
etype = QWebException
orig_type, original, tb = sys.exc_info()
try:
raise etype, original, tb
except etype, e:
for k, v in kw.items():
e.qweb[k] = v
# Will use `raise foo from bar` in python 3 and rename cause to __cause__
e.qweb['cause'] = original
return e
class QWebContext(dict):
def __init__(self, cr, uid, data, loader=None, templates=None, context=None):
self.cr = cr
@ -156,8 +165,8 @@ class QWeb(orm.AbstractModel):
if qwebcontext.loader and name not in qwebcontext.templates:
try:
xml_doc = qwebcontext.loader(name)
except ValueError, e:
raise QWebTemplateNotFound("Loader could not find template %r" % name, template=origin_template, inner=e)
except ValueError:
raise convert_to_qweb_exception(QWebTemplateNotFound, message="Loader could not find template %r" % name, template=origin_template)
self.load_document(xml_doc, qwebcontext=qwebcontext)
if name in qwebcontext.templates:
@ -168,9 +177,9 @@ class QWeb(orm.AbstractModel):
def eval(self, expr, qwebcontext):
try:
return qwebcontext.safe_eval(expr)
except Exception, e:
except Exception:
template = qwebcontext.get('__template__')
raise QWebException("Could not evaluate expression %r" % expr, expression=expr, template=template, inner=e)
raise convert_to_qweb_exception(message="Could not evaluate expression %r" % expr, expression=expr, template=template)
def eval_object(self, expr, qwebcontext):
return self.eval(expr, qwebcontext)
@ -196,9 +205,9 @@ class QWeb(orm.AbstractModel):
try:
return str(expr % qwebcontext)
except Exception, e:
except Exception:
template = qwebcontext.get('__template__')
raise QWebException("Format error for expression %r" % expr, expression=expr, template=template, inner=e)
raise convert_to_qweb_exception(message="Format error for expression %r" % expr, expression=expr, template=template)
def eval_bool(self, expr, qwebcontext):
return int(bool(self.eval(expr, qwebcontext)))
@ -281,9 +290,9 @@ class QWeb(orm.AbstractModel):
g_inner.append(self.render_node(current_node, qwebcontext))
except QWebException:
raise
except Exception, e:
except Exception:
template = qwebcontext.get('__template__')
raise QWebException("Could not render element %r -- %s" % (element.nodeName, e.message), node=element, template=template, inner=e), None, sys.exc_info()[2]
raise convert_to_qweb_exception(message="Could not render element %r" % element.nodeName, node=element, template=template)
name = str(element.nodeName)
inner = "".join(g_inner)
trim = template_attributes.get("trim", 0)