summaryrefslogtreecommitdiff
path: root/odoo/tools
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-07-17 17:48:34 +0200
committerChristophe Simonis <chs@odoo.com>2018-07-17 17:48:34 +0200
commit5b9a51bb1d1f2d8bbb59171f3cea5e4bfd195f5e (patch)
tree8310cc77df4d0e5d5121c3728c462d3b01df7d9f /odoo/tools
parent78c8cda97ec71c5f14731b5e9a7fb544fcdb7b49 (diff)
parent44b77d3702b3c2957c1381367ebff01e024d13b9 (diff)
[MERGE] forward port branch 11.0 up to 44b77d3702b
Diffstat (limited to 'odoo/tools')
-rw-r--r--odoo/tools/safe_eval.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/odoo/tools/safe_eval.py b/odoo/tools/safe_eval.py
index 7f5d6e35e71..7a5ec03707a 100644
--- a/odoo/tools/safe_eval.py
+++ b/odoo/tools/safe_eval.py
@@ -101,6 +101,8 @@ _SAFE_OPCODES = _EXPR_OPCODES.union(set(opmap[x] for x in [
'CALL_FUNCTION_EX',
# Already in P2 but apparently the first one is used more aggressively in P3
'CALL_FUNCTION_KW', 'CALL_FUNCTION_VAR', 'CALL_FUNCTION_VAR_KW',
+ # Added in P3.7 https://bugs.python.org/issue26110
+ 'CALL_METHOD', 'LOAD_METHOD',
'GET_ITER', 'FOR_ITER', 'YIELD_VALUE',
'JUMP_FORWARD', 'JUMP_IF_TRUE', 'JUMP_IF_FALSE', 'JUMP_ABSOLUTE',
# New in Python 2.7 - http://bugs.python.org/issue4715 :