[pypy-svn] r17925 - pypy/dist/pypy/translator

[pedronis at codespeak.net]

Author: pedronis
Date: Wed Sep 28 00:18:45 2005
New Revision: 17925

Modified:
   pypy/dist/pypy/translator/annrpython.py
Log:
use class_ in whereami



Modified: pypy/dist/pypy/translator/annrpython.py
==============================================================================
--- pypy/dist/pypy/translator/annrpython.py	(original)
+++ pypy/dist/pypy/translator/annrpython.py	Wed Sep 28 00:18:45 2005
@@ -439,6 +439,9 @@
         else:
             name = 'UNKNOWN'
             firstlineno = -1
+        cls = getattr(fn, 'class_', None)
+        if cls is not None:
+            name = "%s.%s" % (cls.__name__, name)
         blk = ""
         if block:
             at = block.at()
@@ -447,7 +450,7 @@
         opid=""
         if i is not None:
             opid = " op=%d" % i
-        return "(%s:%d) %s%s%s" % (mod, firstlineno, name, blk, opid)
+        return "(%s:%d)%s%s%s" % (mod, firstlineno, name, blk, opid)
 
     def flowin(self, fn, block):
         #print 'Flowing', block, [self.binding(a) for a in block.inputargs]