diff options
author | Chris Larson <chris_larson@mentor.com> | 2011-05-13 17:35:37 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-08 20:38:24 +0100 |
commit | 2cf67a71e38bca2a2bf8f20c5143a006afb40276 (patch) | |
tree | da4016f7042d97e2a676a4e3cf23a04be24da035 /bitbake/lib | |
parent | 63d14f474d52430f19653ef7ed881cd8dbaf3f42 (diff) | |
download | ast2050-yocto-poky-2cf67a71e38bca2a2bf8f20c5143a006afb40276.zip ast2050-yocto-poky-2cf67a71e38bca2a2bf8f20c5143a006afb40276.tar.gz |
bb.exceptions: don't show a repr of 'self'
Rather than treating self like an ordinary argument, showing a repr of its
value in the function spec when formatting the traceback entry, now we show
the class name for the method as a part of the function name. Example:
Old: bar(self=<some repr of Fooclass>, f=5)
New: Fooclass.bar(f=5)
(Bitbake rev: dbf405f1f7fda41944093906c13044c6cf78f859)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/exceptions.py | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/bitbake/lib/bb/exceptions.py b/bitbake/lib/bb/exceptions.py index 86621d2..62d62cd 100644 --- a/bitbake/lib/bb/exceptions.py +++ b/bitbake/lib/bb/exceptions.py @@ -29,13 +29,30 @@ class TracebackEntry(namedtuple.abc): def __str__(self): return ''.join(self.format()) +def _get_frame_args(frame): + """Get the formatted arguments and class (if available) for a frame""" + arginfo = inspect.getargvalues(frame) + firstarg = arginfo.args[0] + if firstarg == 'self': + self = arginfo.locals['self'] + cls = self.__class__.__name__ + + arginfo.args.pop(0) + del arginfo.locals['self'] + else: + cls = None + + formatted = inspect.formatargvalues(*arginfo) + return formatted, cls def extract_traceback(tb, context=1): frames = inspect.getinnerframes(tb, context) for frame, filename, lineno, function, code_context, index in frames: - args = inspect.formatargvalues(*inspect.getargvalues(frame)) - yield TracebackEntry(filename, lineno, function, args, code_context, index) - + formatted_args, cls = _get_frame_args(frame) + if cls: + function = '%s.%s' % (cls, function) + yield TracebackEntry(filename, lineno, function, formatted_args, + code_context, index) def format_extracted(extracted, formatter=None, limit=None): if limit: |