py: When printf'ing an object as a pointer, pass the concrete pointer.

dpgeorge · dpgeorge · commit 0be6359f3913 · 2016-03-14T22:41:14.000Z
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
@@ -77,7 +77,7 @@ typedef struct _pyb_file_obj_t {
 
 STATIC void file_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
-    mp_printf(print, "<io.%s %p>", mp_obj_get_type_str(self_in), self_in);
+    mp_printf(print, "<io.%s %p>", mp_obj_get_type_str(self_in), MP_OBJ_TO_PTR(self_in));
 }
 
 STATIC mp_uint_t file_obj_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
diff --git a/py/objtype.c b/py/objtype.c
@@ -232,7 +232,7 @@ STATIC void instance_print(const mp_print_t *print, mp_obj_t self_in, mp_print_k
     }
 
     // TODO: CPython prints fully-qualified type name
-    mp_printf(print, "<%s object at %p>", mp_obj_get_type_str(self_in), self_in);
+    mp_printf(print, "<%s object at %p>", mp_obj_get_type_str(self_in), self);
 }
 
 mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t *self, size_t n_args, size_t n_kw, const mp_obj_t *args) {

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ typedef struct _pyb_file_obj_t {`
`77`	`77`
`78`	`78`	`STATIC void file_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind) {`
`79`	`79`	`(void)kind;`
`80`		`- mp_printf(print, "<io.%s %p>", mp_obj_get_type_str(self_in), self_in);`
	`80`	`+ mp_printf(print, "<io.%s %p>", mp_obj_get_type_str(self_in), MP_OBJ_TO_PTR(self_in));`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`STATIC mp_uint_t file_obj_read(mp_obj_t self_in, void buf, mp_uint_t size, int errcode) {`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ STATIC void instance_print(const mp_print_t *print, mp_obj_t self_in, mp_print_k`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`// TODO: CPython prints fully-qualified type name`
`235`		`- mp_printf(print, "<%s object at %p>", mp_obj_get_type_str(self_in), self_in);`
	`235`	`+ mp_printf(print, "<%s object at %p>", mp_obj_get_type_str(self_in), self);`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`mp_obj_t mp_obj_instance_make_new(const mp_obj_type_t self, size_t n_args, size_t n_kw, const mp_obj_t args) {`