summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Martinelli <nim@odoo.com>2018-06-12 14:53:50 +0200
committerNicolas Martinelli <nim-odoo@users.noreply.github.com>2018-06-12 15:48:43 +0200
commit9a3fc2a06f7faad5e4957cdc7aaa4246e4dbbbe6 (patch)
treeed11b8d1fef9053f2059ceeaaec45018d1888654
parent25955f6d94bdb5988c9a39c676697444630bcd37 (diff)
[FIX] base: P3.5 - P3.6 compatibility
In P3.6, the error message has changed.
-rw-r--r--odoo/addons/base/tests/test_qweb.py3
1 files changed, 3 insertions, 0 deletions
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()