diff options
| author | Vo Minh Thu <vmt@openerp.com> | 2011-03-22 15:08:41 +0100 |
|---|---|---|
| committer | Vo Minh Thu <vmt@openerp.com> | 2011-03-22 15:08:41 +0100 |
| commit | d02ffafe3096e8be515abaec11c50ef0d157c99e (patch) | |
| tree | f3d26b8e59a9f64d7da0f3d9ac3aee2e8b9f2784 /openerp/tools/safe_eval.py | |
| parent | 1fb6165a8a5da1a9860e8ea76495251b7349aa5b (diff) | |
| parent | 65a3751613a392ae6a36f6efbcaeade924565d84 (diff) | |
[MERGE] merged the 6.0 branch.
bzr revid: vmt@openerp.com-20110322140841-6lt7ky1ohxbrgx68
Diffstat (limited to 'openerp/tools/safe_eval.py')
| -rw-r--r-- | openerp/tools/safe_eval.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/openerp/tools/safe_eval.py b/openerp/tools/safe_eval.py index 740b426f050..6c068d8fd78 100644 --- a/openerp/tools/safe_eval.py +++ b/openerp/tools/safe_eval.py @@ -39,7 +39,10 @@ import os __all__ = ['test_expr', 'literal_eval', 'safe_eval', 'const_eval', 'ext_eval' ] -_ALLOWED_MODULES = ['_strptime'] +# The time module is usually already provided in the safe_eval environment +# but some code, e.g. datetime.datetime.now() (Windows/Python 2.5.2, bug +# lp:703841), does import time. +_ALLOWED_MODULES = ['_strptime', 'time'] _CONST_OPCODES = set(opmap[x] for x in [ 'POP_TOP', 'ROT_TWO', 'ROT_THREE', 'ROT_FOUR', 'DUP_TOP','POP_BLOCK','SETUP_LOOP', |