From c6d6ae8aec9dbb903c95c0381d940afb6358c66a Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Thu, 19 Nov 2015 14:59:44 +0100
Subject: [PATCH] [FIX] qweb: handle unicode tags and attributes

closes #8895
---
 addons/web/static/lib/qweb/qweb-test-utf8tags.xml |  8 ++++++++
 openerp/addons/base/ir/ir_qweb.py                 | 11 ++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 addons/web/static/lib/qweb/qweb-test-utf8tags.xml

diff --git a/addons/web/static/lib/qweb/qweb-test-utf8tags.xml b/addons/web/static/lib/qweb/qweb-test-utf8tags.xml
new file mode 100644
index 00000000000..dd51635bab2
--- /dev/null
+++ b/addons/web/static/lib/qweb/qweb-test-utf8tags.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<templates>
+    <t t-name="fixed-literal">
+        <Año t-att-falló="'agüero'"/>
+    </t>
+    <result id="fixed-literal"><![CDATA[<Año falló="agüero"></Año>]]></result>
+</templates>
diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index 3fc8313e727..c183a013430 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -116,8 +116,9 @@ class QWeb(orm.AbstractModel):
     _name = 'ir.qweb'
 
     _void_elements = frozenset([
-        'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen',
-        'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr'])
+        u'area', u'base', u'br', u'col', u'embed', u'hr', u'img', u'input',
+        u'keygen', u'link', u'menuitem', u'meta', u'param', u'source',
+        u'track', u'wbr'])
     _format_regex = re.compile(
         '(?:'
             # ruby-style pattern
@@ -266,7 +267,7 @@ class QWeb(orm.AbstractModel):
         t_render = None
         template_attributes = {}
         for (attribute_name, attribute_value) in element.attrib.iteritems():
-            attribute_name = str(attribute_name)
+            attribute_name = unicode(attribute_name)
             if attribute_name == "groups":
                 cr = qwebcontext.get('request') and qwebcontext['request'].cr or None
                 uid = qwebcontext.get('request') and qwebcontext['request'].uid or None
@@ -325,7 +326,7 @@ class QWeb(orm.AbstractModel):
                 except Exception:
                     template = qwebcontext.get('__template__')
                     raise_qweb_exception(message="Could not render element %r" % element.tag, node=element, template=template)
-        name = str(element.tag)
+        name = unicode(element.tag)
         inner = "".join(g_inner)
         trim = template_attributes.get("trim", 0)
         if trim == 0:
@@ -344,7 +345,7 @@ class QWeb(orm.AbstractModel):
                 for qwebcontext in (name, generated_attributes, inner, name)
             )
         else:
-            return "<%s%s/>" % (name, generated_attributes)
+            return "<%s%s/>" % (name.encode("utf-8"), generated_attributes)
 
     def render_attribute(self, element, name, value, qwebcontext):
         return _build_attribute(name, value)