Reorganize code, display fewer variables

great_justice/__init__.py

@@ -7,7 +7,7 @@
 '''
 
 import contextlib
-import pprint
+import inspect
 import sys
 import traceback
 
@@ -23,42 +23,13 @@ def what_happen(logger=None):
     while trace:
         frame = trace.tb_frame
         trace = trace.tb_next
-        filename = frame.f_code.co_filename
+        filename = inspect.getsourcefile(frame)
         # skip self
         filename_base = filename.rsplit('.', 1)[0]
         local_base = __file__.rsplit('.', 1)[0]
         if filename_base == local_base:
             continue
-        utils.log(logger,
-             structure.CodeLine(filename, frame.f_lineno, frame.f_code.co_name))
-        line, tokens = utils.get_code(filename, frame.f_lineno, frame.f_globals)
-        if line:
-            utils.log(logger, structure.Code(line), indent=1)
-            for key in tokens:
-                value = (frame.f_locals.get(key) or
-                         frame.f_globals.get(key) or
-                         frame.f_builtins.get(key))
-                if value:
-                    try:
-                        value = pprint.pformat(value, width=60)
-                    except Exception: # pylint: disable=W0703
-                        utils.log(
-                            logger,
-                            structure.ShortVariable(
-                                key,
-                                '<EXCEPTION RAISED WHILE TRYING TO PRINT>'),
-                            indent=2)
-                    else:
-                        if value.count('\n'):
-                            utils.log(logger, structure.LongVariable(key),
-                                      indent=2)
-                            utils.log(logger, structure.Value(value), indent=3)
-                        else:
-                            utils.log(logger,
-                                 structure.ShortVariable(key, value), indent=2)
-                else:
-                    utils.log(logger, structure.UndefinedVariable(key),
-                              indent=2)
+        utils.log_frame(logger, frame)
     utils.log(
         logger,
         structure.ExceptionValue(

great_justice/utils.py

@@ -5,38 +5,45 @@
 '''
 
 import ast
+import inspect
 import linecache
+import pprint
 import textwrap
 
-def get_code(filename, lineno, module_globals):
+from . import structure
+
+def get_module_context(obj):
     '''
-    Instead of providing the last line of a multi-line expression,
-    try to provide a valid context by looking for a smallest chunk
-    of code that can be compiled
+    Instead of providing the whole module source, try to provide a valid
+    context by looking for a smallest chunk of code that can be compiled
     '''
+    filename = inspect.getsourcefile(obj)
     linecache.checkcache(filename)
-    code = linecache.getline(filename, lineno, module_globals)
-    if not code:
-        return None, []
-    tree = None
-    tokens = []
+    lineno = inspect.getlineno(obj)
+    code = linecache.getline(filename, lineno, obj.f_globals)
     lines = 0
     while True:
         try:
-            tree = ast.parse(textwrap.dedent(code) + '\n')
+            ast.parse(textwrap.dedent(code) + '\n')
         except SyntaxError:
             if not lineno or lines > 10:
-                break
+                return code
             lines += 1
             prev_line = linecache.getline(filename, lineno - lines,
-                                          module_globals)
+                                          obj.f_globals)
             code = prev_line + code
         else:
-            for node in ast.walk(tree):
-                if isinstance(node, ast.Name):
-                    tokens.append(node.id)
-            break
-    return textwrap.dedent(code.strip()), tokens
+            return textwrap.dedent(code.strip('\n\r'))
+
+def get_source(obj):
+    '''
+    Get the source code for the frame object
+    '''
+    lines, lineno = inspect.findsource(obj)
+    if inspect.isframe(obj) and obj.f_globals is obj.f_locals:
+        return get_module_context(obj)
+    return textwrap.dedent(
+        ''.join(inspect.getblock(lines[lineno:])).strip('\n\r'))
 
 def log(logger, info, indent=0):
     '''
@@ -51,3 +58,40 @@ def log(logger, info, indent=0):
         lines = info.prettyformat().splitlines()
         for line in lines:
             print '  ' * indent + line
+
+def log_frame(logger, frame):
+    '''
+    Parse and log a single frame of a traceback
+    '''
+    filename = inspect.getsourcefile(frame)
+    log(logger,
+        structure.CodeLine(filename, frame.f_lineno, frame.f_code.co_name))
+    code = get_source(frame)
+    missing = object()
+    if code:
+        log(logger, structure.Code(code), indent=1)
+        for key in sorted(frame.f_code.co_varnames):
+            value = frame.f_locals.get(
+                key,
+                frame.f_globals.get(
+                     key,
+                     frame.f_builtins.get(key, missing)))
+            if value is not missing:
+                try:
+                    value = pprint.pformat(value, width=60)
+                except Exception: # pylint: disable=W0703
+                    log(logger,
+                        structure.ShortVariable(
+                            key,
+                            '<EXCEPTION RAISED WHILE TRYING TO PRINT>'),
+                        indent=2)
+                else:
+                    if value.count('\n'):
+                        log(logger, structure.LongVariable(key), indent=2)
+                        log(logger, structure.Value(value), indent=3)
+                    else:
+                        log(logger, structure.ShortVariable(key, value),
+                            indent=2)
+            else:
+                log(logger, structure.UndefinedVariable(key), indent=2)
+

setup.py

@@ -19,7 +19,7 @@
       author='Patryk Zawadzki',
       author_email='patrys@gmail.com',
       description='Debug every ZIG',
-      version = '2012.6.4',
+      version = '2012.6.5',
       packages = find_packages(),
       classifiers=CLASSIFIERS,
       install_requires=REQUIREMENTS,