From 9a3fc2a06f7faad5e4957cdc7aaa4246e4dbbbe6 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Tue, 12 Jun 2018 14:53:50 +0200
Subject: [PATCH] [FIX] base: P3.5 - P3.6 compatibility

In P3.6, the error message has changed.
---
 odoo/addons/base/tests/test_qweb.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/odoo/addons/base/tests/test_qweb.py b/odoo/addons/base/tests/test_qweb.py
index 601a5ae1a6b..136ad02e250 100644
--- a/odoo/addons/base/tests/test_qweb.py
+++ b/odoo/addons/base/tests/test_qweb.py
@@ -5,6 +5,7 @@ import collections
 import json
 import os.path
 import re
+import sys
 
 from lxml import etree
 
@@ -481,6 +482,8 @@ class TestQWebNS(TransactionCase):
             """
         })
         error_msg = "Can't convert 'int' object to str implicitly"
+        if sys.version_info >= (3, 6):
+            error_msg = "must be str, not int"
         with self.assertRaisesRegexp(QWebException, error_msg):
             view1.render()