unix: Enable MICROPY_PY_STR_BYTES_CMP_WARN.

pfalcon · pfalcon · commit 918851e8365d · 2016-07-22T00:52:07.000+03:00
Also, fix a warning text (remove "duplicate" BytesWarning).
diff --git a/py/obj.c b/py/obj.c
@@ -199,7 +199,7 @@ bool mp_obj_equal(mp_obj_t o1, mp_obj_t o2) {
     str_cmp_err:
         #if MICROPY_PY_STR_BYTES_CMP_WARN
         if (MP_OBJ_IS_TYPE(o1, &mp_type_bytes) || MP_OBJ_IS_TYPE(o2, &mp_type_bytes)) {
-            mp_warning("BytesWarning: Comparison between bytes and str");
+            mp_warning("Comparison between bytes and str");
         }
         #endif
         return false;
diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h
@@ -138,6 +138,7 @@
 // names in exception messages (may require more RAM).
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
 #define MICROPY_WARNINGS            (1)
+#define MICROPY_PY_STR_BYTES_CMP_WARN (1)
 
 // Define to 1 to use undertested inefficient GC helper implementation
 // (if more efficient arch-specific one is not available).

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ bool mp_obj_equal(mp_obj_t o1, mp_obj_t o2) {`
`199`	`199`	`str_cmp_err:`
`200`	`200`	`#if MICROPY_PY_STR_BYTES_CMP_WARN`
`201`	`201`	`if (MP_OBJ_IS_TYPE(o1, &mp_type_bytes) \|\| MP_OBJ_IS_TYPE(o2, &mp_type_bytes)) {`
`202`		`- mp_warning("BytesWarning: Comparison between bytes and str");`
	`202`	`+ mp_warning("Comparison between bytes and str");`
`203`	`203`	`}`
`204`	`204`	`#endif`
`205`	`205`	`return false;`