py/objstr: Use better msg in bad implicit str/bytes conversion exception

stinos · dpgeorge · commit bf29fe2e138a · 2017-03-20T15:11:45.000+11:00
Instead of always reporting some object cannot be implicitly be converted
to a 'str', even when it is a 'bytes' object, adjust the logic so that
when trying to convert str to bytes it is shown like that.
This will still report bad implicit conversion from e.g. 'int to bytes'
as 'int to str' but it will not result in the confusing
'can't convert 'str' object to str implicitly' anymore for calls like
b'somestring'.count('a').
diff --git a/py/objstr.c b/py/objstr.c
@@ -2065,9 +2065,10 @@ STATIC void bad_implicit_conversion(mp_obj_t self_in) {
     if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
         mp_raise_TypeError("can't convert to str implicitly");
     } else {
+        const qstr src_name = mp_obj_get_type(self_in)->name;
         nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
-            "can't convert '%s' object to str implicitly",
-            mp_obj_get_type_str(self_in)));
+            "can't convert '%q' object to %q implicitly",
+            src_name, src_name == MP_QSTR_str ? MP_QSTR_bytes : MP_QSTR_str));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2065,9 +2065,10 @@ STATIC void bad_implicit_conversion(mp_obj_t self_in) {`
`2065`	`2065`	`if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {`
`2066`	`2066`	`mp_raise_TypeError("can't convert to str implicitly");`
`2067`	`2067`	`} else {`
	`2068`	`+ const qstr src_name = mp_obj_get_type(self_in)->name;`
`2068`	`2069`	`nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,`
`2069`		`- "can't convert '%s' object to str implicitly",`
`2070`		`- mp_obj_get_type_str(self_in)));`
	`2070`	`+ "can't convert '%q' object to %q implicitly",`
	`2071`	`+ src_name, src_name == MP_QSTR_str ? MP_QSTR_bytes : MP_QSTR_str));`
`2071`	`2072`	`}`
`2072`	`2073`	`}`
`2073`	`2074`