diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-08-24 13:17:53 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-08-24 13:17:53 +0200 |
| commit | 017ee5eab376b4f09beb62812c1cbc682009ed86 (patch) | |
| tree | 2af185b0604cd8ce9129c39137bbf39d21d7be89 /odoo/tools/safe_eval.py | |
| parent | 006c16198f7f68c9dc8b895defd013f33008840a (diff) | |
| parent | 877e7098719195ed2934fc9c3b5c3bd8ad8bab07 (diff) | |
[MERGE] forward port branch saas-17 up to 877e7098719
Diffstat (limited to 'odoo/tools/safe_eval.py')
| -rw-r--r-- | odoo/tools/safe_eval.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/odoo/tools/safe_eval.py b/odoo/tools/safe_eval.py index de767fb7453..fec89fac087 100644 --- a/odoo/tools/safe_eval.py +++ b/odoo/tools/safe_eval.py @@ -26,6 +26,7 @@ import werkzeug from . import pycompat from .misc import ustr +from . import pycompat import odoo @@ -267,8 +268,9 @@ _BUILTINS = { 'True': True, 'False': False, 'None': None, + 'bytes': bytes, 'str': str, - 'unicode': unicode, + 'unicode': pycompat.text_type, 'bool': bool, 'int': int, 'float': float, |