From 94b60d1247be4ce42eaefafe13e73169bd978bd7 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 30 Mar 2010 20:06:07 -0700 Subject: Consolidate the exec/eval bits, switch anonfunc to better_exec, etc The methodpool, ${@} expansions, anonymous python functions, event handlers now all run with the same global context, ensuring a consistent environment for them. Added a bb.utils.better_eval function which does an eval() with the same globals as better_exec. (Bitbake rev: 424d7e267b009cc19b8503eadab782736d9597d0) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/data_smart.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'bitbake/lib/bb/data_smart.py') diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 55a6f3143c..77f1861381 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -50,12 +50,6 @@ class DataSmart: self._seen_overrides = seen self.expand_cache = {} - self.expand_globals = { - "os": os, - "bb": bb, - "time": time, - "d": self - } def expand(self,s, varname): def var_sub(match): @@ -72,7 +66,7 @@ class DataSmart: def python_sub(match): code = match.group()[3:-1] codeobj = compile(code.strip(), varname or "", "eval") - s = eval(codeobj, self.expand_globals, {}) + s = utils.better_eval(codeobj, {"d": self}) if type(s) == types.IntType: s = str(s) return s -- cgit v1.2.3-54-g00ecf