Merge lp:~spiv/meliae/frame-info into lp:meliae

[Andrew Bennetts]

I haven't tested it does what I expect, but it compiles and passes tests, and it *looks* plausible...

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Andrew Bennetts wrote:
> Andrew Bennetts has proposed merging lp:~spiv/meliae/frame-info into lp:meliae.
>
> Requested reviews:
> Meliae Development Team (meliae-dev)
>
>
> I haven't tested it does what I expect, but it compiles and passes tests, and it *looks* plausible...
>

I went ahead and wrote a test that used sys._get_frame().

 merge: approve

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkw7eRUACgkQJdeBCYSNAAP0LwCeKMkmKUTRPIOP6DS17yah+sru
YKsAoJzZMEliONezDHFRsZtJlMFOf9Jq
=fhK5
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'meliae/_scanner_core.c'
--- meliae/_scanner_core.c	2010-06-30 18:05:55 +0000
+++ meliae/_scanner_core.c	2010-07-12 17:16:44 +0000
@@ -472,6 +472,12 @@
         _write_to_ref_info(info, ", \"len\": " SSIZET_FMT, PySet_GET_SIZE(c_obj));
     } else if (PyDict_Check(c_obj)) {
         _write_to_ref_info(info, ", \"len\": " SSIZET_FMT, PyDict_Size(c_obj));
+    } else if (PyFrame_Check(c_obj)) {
+    	PyCodeObject *co = ((PyFrameObject*)c_obj)->f_code;
+        if (co) {
+            _write_static_to_info(info, ", \"value\": ");
+            _dump_string(info, co->co_name);
+        }
     }
     _write_static_to_info(info, ", \"refs\": [");
     do_traverse = 1;

=== modified file 'meliae/_scanner_core.h'
--- meliae/_scanner_core.h	2009-12-30 16:25:15 +0000
+++ meliae/_scanner_core.h	2010-07-12 17:16:44 +0000
@@ -23,6 +23,8 @@
 #define _SCANNER_CORE_H_
 
 #include <Python.h>
+#include <code.h>
+#include <frameobject.h>
 #include <stdio.h>
 
 /**