diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-03-30 20:06:07 -0700 |
---|---|---|
committer | Chris Larson <chris_larson@mentor.com> | 2010-03-30 20:06:09 -0700 |
commit | 424d7e267b009cc19b8503eadab782736d9597d0 (patch) | |
tree | aeba768adb121e1f562bd6b39e6c7e2897d701e5 /lib/bb/utils.py | |
parent | 97da0cebbaf4dd1b46e58bd2e80cab6c007ae7c9 (diff) | |
download | bitbake-424d7e267b009cc19b8503eadab782736d9597d0.tar.gz |
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.
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'lib/bb/utils.py')
-rw-r--r-- | lib/bb/utils.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/lib/bb/utils.py b/lib/bb/utils.py index ad0aa68b2..de0f3d346 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -21,9 +21,16 @@ BitBake Utility Functions separators = ".-" -import re, fcntl, os, types, bb, string, stat, shutil +import re, fcntl, os, types, bb, string, stat, shutil, time from commands import getstatusoutput +# Context used in better_exec, eval +_context = { + "os": os, + "bb": bb, + "time": time, +} + def explode_version(s): r = [] alpha_regexp = re.compile('^([a-zA-Z]+)(.*)$') @@ -152,13 +159,13 @@ def _print_trace(body, line): bb.msg.error(bb.msg.domain.Util, "\t%.4d:%s" % (i, body[i-1]) ) -def better_compile(text, file, realfile): +def better_compile(text, file, realfile, mode = "exec"): """ A better compile method. This method will print the offending lines. """ try: - return compile(text, file, "exec") + return compile(text, file, mode) except Exception, e: import bb,sys @@ -181,7 +188,7 @@ def better_exec(code, context, text, realfile): """ import bb,sys try: - exec code in context + exec code in _context, context except: (t,value,tb) = sys.exc_info() @@ -203,6 +210,9 @@ def better_exec(code, context, text, realfile): raise +def better_eval(source, locals): + return eval(source, _context, locals) + def Enum(*names): """ A simple class to give Enum support |