data_smart: be explicit about what we make available to eval'd python code
(Bitbake rev: 6a73dda60f50e9b3e5513795d1ec7207d1446de2) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
6028daedcb
commit
964085f701
|
@ -39,6 +39,11 @@ __setvar_keyword__ = ["_append","_prepend"]
|
||||||
__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?')
|
__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?')
|
||||||
__expand_var_regexp__ = re.compile(r"\${[^{}]+}")
|
__expand_var_regexp__ = re.compile(r"\${[^{}]+}")
|
||||||
__expand_python_regexp__ = re.compile(r"\${@.+?}")
|
__expand_python_regexp__ = re.compile(r"\${@.+?}")
|
||||||
|
_expand_globals = {
|
||||||
|
"os": os,
|
||||||
|
"bb": bb,
|
||||||
|
"time": time,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
class DataSmart:
|
class DataSmart:
|
||||||
|
@ -50,6 +55,7 @@ class DataSmart:
|
||||||
self._seen_overrides = seen
|
self._seen_overrides = seen
|
||||||
|
|
||||||
self.expand_cache = {}
|
self.expand_cache = {}
|
||||||
|
self.expand_locals = {"d": self}
|
||||||
|
|
||||||
def expand(self,s, varname):
|
def expand(self,s, varname):
|
||||||
def var_sub(match):
|
def var_sub(match):
|
||||||
|
@ -66,8 +72,7 @@ class DataSmart:
|
||||||
def python_sub(match):
|
def python_sub(match):
|
||||||
import bb
|
import bb
|
||||||
code = match.group()[3:-1]
|
code = match.group()[3:-1]
|
||||||
locals()['d'] = self
|
s = eval(code, _expand_globals, self.expand_locals)
|
||||||
s = eval(code)
|
|
||||||
if type(s) == types.IntType: s = str(s)
|
if type(s) == types.IntType: s = str(s)
|
||||||
return s
|
return s
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue