Two minor changes to the way python snippet expansion happens
- Use a single dictionary for the context, both global & local, since for some reason it chokes wanting a global "d" rather than a local in the metadata. - First compile the string into a code object before running eval, so we can include the variable name in an evaluation error. (Bitbake rev: 49534d928a37e0804ca84eed186cd22363023b2e) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
f8a8ec5ceb
commit
d8c8612d92
|
@ -39,11 +39,6 @@ __setvar_keyword__ = ["_append","_prepend"]
|
|||
__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?')
|
||||
__expand_var_regexp__ = re.compile(r"\${[^{}]+}")
|
||||
__expand_python_regexp__ = re.compile(r"\${@.+?}")
|
||||
_expand_globals = {
|
||||
"os": os,
|
||||
"bb": bb,
|
||||
"time": time,
|
||||
}
|
||||
|
||||
|
||||
class DataSmart:
|
||||
|
@ -55,7 +50,12 @@ class DataSmart:
|
|||
self._seen_overrides = seen
|
||||
|
||||
self.expand_cache = {}
|
||||
self.expand_locals = {"d": self}
|
||||
self.expand_context = {
|
||||
"os": os,
|
||||
"bb": bb,
|
||||
"time": time,
|
||||
"d": self
|
||||
}
|
||||
|
||||
def expand(self,s, varname):
|
||||
def var_sub(match):
|
||||
|
@ -70,9 +70,9 @@ class DataSmart:
|
|||
return match.group()
|
||||
|
||||
def python_sub(match):
|
||||
import bb
|
||||
code = match.group()[3:-1]
|
||||
s = eval(code, _expand_globals, self.expand_locals)
|
||||
codeobj = compile(code.strip(), varname or "<expansion>", "eval")
|
||||
s = eval(codeobj, self.expand_context)
|
||||
if type(s) == types.IntType: s = str(s)
|
||||
return s
|
||||
|
||||
|
|
Loading…
Reference in New Issue