[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 94d417c..2d548ff 100644 (file)
--- a/openerp/tools/safe_eval.py
+++ b/openerp/tools/safe_eval.py
@@ -72,7 +72,7 @@ _SAFE_OPCODES = _EXPR_OPCODES.union(set(opmap[x] for x in [
     # 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',
-    'LOAD_FAST', 'STORE_FAST', 'DELETE_FAST',
+    'LOAD_FAST', 'STORE_FAST', 'DELETE_FAST', 'UNPACK_SEQUENCE',
     'LOAD_GLOBAL', # Only allows access to restricted globals
     ] if x in opmap))
 
@@ -300,6 +300,7 @@ def safe_eval(expr, globals_dict=None, locals_dict=None, mode="eval", nocopy=Fal
             'range': range,
             'xrange': xrange,
             'zip': zip,
+            'Exception': Exception,
         }
     )
     if locals_builtins: