1 files changed, 1 insertions, 7 deletions

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 "<expansion>", "eval")
-            s = eval(codeobj, self.expand_globals, {})
+            s = utils.better_eval(codeobj, {"d": self})
             if type(s) == types.IntType: s = str(s)
             return s