[MERGE] forward port of branch saas-5 up to e4cb520

[odoo/odoo.git] / openerp / tools / safe_eval.py

diff --git a/openerp/tools/safe_eval.py b/openerp/tools/safe_eval.py
index 4f39e1f..2d548ff 100644 (file)
--- a/openerp/tools/safe_eval.py
+++ b/openerp/tools/safe_eval.py
@@ -68,7 +68,7 @@ _SAFE_OPCODES = _EXPR_OPCODES.union(set(opmap[x] for x in [
     'STORE_NAME', 'GET_ITER', 'FOR_ITER', 'LIST_APPEND', 'DELETE_NAME',
     'JUMP_FORWARD', 'JUMP_IF_TRUE', 'JUMP_IF_FALSE', 'JUMP_ABSOLUTE',
     'MAKE_FUNCTION', 'SLICE+0', 'SLICE+1', 'SLICE+2', 'SLICE+3', 'BREAK_LOOP',
-    'CONTINUE_LOOP', 'RAISE_VARARGS',
+    'CONTINUE_LOOP', 'RAISE_VARARGS', 'YIELD_VALUE',
     # New in Python 2.7 - http://bugs.python.org/issue4715 :
     'JUMP_IF_FALSE_OR_POP', 'JUMP_IF_TRUE_OR_POP', 'POP_JUMP_IF_FALSE',
     'POP_JUMP_IF_TRUE', 'SETUP_EXCEPT', 'END_FINALLY',