summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-03-30 16:59:46 -0700
committerChris Larson <chris_larson@mentor.com>2010-03-30 16:59:46 -0700
commit97da0cebbaf4dd1b46e58bd2e80cab6c007ae7c9 (patch)
tree02bbe1d1f924d3d85f375f31ba6e9eff85c0a1b7
parent49534d928a37e0804ca84eed186cd22363023b2e (diff)
downloadbitbake-97da0cebbaf4dd1b46e58bd2e80cab6c007ae7c9.tar.gz
Pass an empty locals dict in expansion, since list comprehensions apparently leak their '_' helper variable
Signed-off-by: Chris Larson <chris_larson@mentor.com>
-rw-r--r--lib/bb/data_smart.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 54ed72823..55a6f3143 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -50,7 +50,7 @@ class DataSmart:
self._seen_overrides = seen
self.expand_cache = {}
- self.expand_context = {
+ self.expand_globals = {
"os": os,
"bb": bb,
"time": time,
@@ -72,7 +72,7 @@ class DataSmart:
def python_sub(match):
code = match.group()[3:-1]
codeobj = compile(code.strip(), varname or "<expansion>", "eval")
- s = eval(codeobj, self.expand_context)
+ s = eval(codeobj, self.expand_globals, {})
if type(s) == types.IntType: s = str(s)
return s