From ae866acf08abe91fe87a3d3f4899070962b795cc Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@odoo.com>
Date: Wed, 17 May 2017 10:58:30 +0200
Subject: [PATCH] [FIX] P3: assets bundle text model

* remains is a list of text
* sep is text
* json.dumps generates text (surprise!) so beware with that
---
 odoo/addons/base/ir/ir_qweb/assetsbundle.py | 10 +++++-----
 odoo/addons/base/ir/ir_qweb/ir_qweb.py      |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/odoo/addons/base/ir/ir_qweb/assetsbundle.py b/odoo/addons/base/ir/ir_qweb/assetsbundle.py
index fcf9abe4d5d..8f894107b81 100644
--- a/odoo/addons/base/ir/ir_qweb/assetsbundle.py
+++ b/odoo/addons/base/ir/ir_qweb/assetsbundle.py
@@ -102,7 +102,7 @@ class AssetsBundle(object):
 
     def to_html(self, sep=None, css=True, js=True, debug=False, async=False, url_for=(lambda url: url)):
         if sep is None:
-            sep = '\n            '
+            sep = u'\n            '
         response = []
         if debug == 'assets':
             if css and self.stylesheets:
@@ -121,12 +121,12 @@ class AssetsBundle(object):
             if css and self.stylesheets:
                 css_attachments = self.css() or []
                 for attachment in css_attachments:
-                    response.append('<link href="%s" rel="stylesheet"/>' % url_for(attachment.url))
+                    response.append(u'<link href="%s" rel="stylesheet"/>' % url_for(attachment.url))
                 if self.css_errors:
                     msg = '\n'.join(self.css_errors)
                     response.append(JavascriptAsset(self, inline=self.dialog_message(msg)).to_html())
             if js and self.javascripts:
-                response.append('<script %s type="text/javascript" src="%s"></script>' % (async and 'async="async"' or '', url_for(self.js().url)))
+                response.append(u'<script %s type="text/javascript" src="%s"></script>' % (async and u'async="async"' or '', url_for(self.js().url)))
         response.extend(self.remains)
 
         return sep + sep.join(response)
@@ -149,8 +149,8 @@ class AssetsBundle(object):
         Not really a full checksum.
         We compute a SHA1 on the rendered bundle + max linked files last_modified date
         """
-        check = json.dumps(self.files) + b",".join(self.remains) + self.last_modified.encode('utf-8')
-        return hashlib.sha1(check).hexdigest()
+        check = u"%s%s%s" % (json.dumps(self.files), u",".join(self.remains), self.last_modified)
+        return hashlib.sha1(check.encode('utf-8')).hexdigest()
 
     def clean_attachments(self, type):
         """ Takes care of deleting any outdated ir.attachment records associated to a bundle before
diff --git a/odoo/addons/base/ir/ir_qweb/ir_qweb.py b/odoo/addons/base/ir/ir_qweb/ir_qweb.py
index b23ab34f103..6a23054519e 100644
--- a/odoo/addons/base/ir/ir_qweb/ir_qweb.py
+++ b/odoo/addons/base/ir/ir_qweb/ir_qweb.py
@@ -219,7 +219,7 @@ class IrQWeb(models.AbstractModel, QWeb):
         remains = []
         for el in html.fragments_fromstring(template):
             if isinstance(el, pycompat.string_types):
-                remains.append(el)
+                remains.append(pycompat.to_text(el))
             elif isinstance(el, html.HtmlElement):
                 href = el.get('href', '')
                 src = el.get('src', '')
@@ -243,10 +243,10 @@ class IrQWeb(models.AbstractModel, QWeb):
                     filename = get_resource_path(*path) if path else None
                     files.append({'atype': atype, 'url': src, 'filename': filename, 'content': el.text, 'media': media})
                 else:
-                    remains.append(html.tostring(el))
+                    remains.append(html.tostring(el, encoding='unicode'))
             else:
                 try:
-                    remains.append(html.tostring(el))
+                    remains.append(html.tostring(el, encoding='unicode'))
                 except Exception:
                     # notYETimplementederror
                     raise NotImplementedError