[pypy-svn] r74705 - pypy/branch/blackhole-improvement/pypy/rpython

[arigo at codespeak.net]

Author: arigo
Date: Mon May 24 14:23:49 2010
New Revision: 74705

Modified:
   pypy/branch/blackhole-improvement/pypy/rpython/llinterp.py
Log:
Fix printing the traceback from the llinterp.


Modified: pypy/branch/blackhole-improvement/pypy/rpython/llinterp.py
==============================================================================
--- pypy/branch/blackhole-improvement/pypy/rpython/llinterp.py	(original)
+++ pypy/branch/blackhole-improvement/pypy/rpython/llinterp.py	Mon May 24 14:23:49 2010
@@ -110,16 +110,14 @@
         self.traceback_frames = []
         lines = []
         for frame in frames:
-            logline = frame.graph.name
+            logline = frame.graph.name + "()"
             if frame.curr_block is None:
                 logline += " <not running yet>"
                 lines.append(logline)
                 continue
             try:
-                logline += " " + self.typer.annotator.annotated[frame.curr_block].__module__
+                logline += " " + self.typer.annotator.annotated[frame.curr_block].func.__module__
             except (KeyError, AttributeError):
-                # if the graph is from the GC it was not produced by the same
-                # translator :-(
                 logline += " <unknown module>"
             lines.append(logline)
             for i, operation in enumerate(frame.curr_block.operations):