py/runtime: Fix bool unary op for subclasses of native types.

jimmo · dpgeorge · commit 4e39ff221abf · 2021-07-23T12:40:00.000+10:00
Previously a subclass of a type that didn't implement unary_op, or didn't handle MP_UNARY_OP_BOOL, would raise TypeError on bool conversion. Fixes adafruit#5677.
diff --git a/py/runtime.c b/py/runtime.c
@@ -284,6 +284,12 @@ mp_obj_t mp_unary_op(mp_unary_op_t op, mp_obj_t arg) {
                 return result;
             }
         }
+        if (op == MP_UNARY_OP_BOOL) {
+            // Type doesn't have unary_op (or didn't handle MP_UNARY_OP_BOOL),
+            // so is implicitly True as this code path is impossible to reach
+            // if arg==mp_const_none.
+            return mp_const_true;
+        }
         // With MP_UNARY_OP_INT, mp_unary_op() becomes a fallback for mp_obj_get_int().
         // In this case provide a more focused error message to not confuse, e.g. chr(1.0)
         #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE
diff --git a/tests/basics/unary_op.py b/tests/basics/unary_op.py
@@ -23,5 +23,12 @@ class A: pass
 # check user instances derived from builtins
 class B(int): pass
 print(not B())
+print(True if B() else False)
 class C(list): pass
 print(not C())
+print(True if C() else False)
+# type doesn't define unary_op
+class D(type): pass
+d = D("foo", (), {})
+print(not d)
+print(True if d else False)

Original file line number	Diff line number	Diff line change
`@@ -284,6 +284,12 @@ mp_obj_t mp_unary_op(mp_unary_op_t op, mp_obj_t arg) {`
`284`	`284`	`return result;`
`285`	`285`	`}`
`286`	`286`	`}`
	`287`	`+ if (op == MP_UNARY_OP_BOOL) {`
	`288`	`+ // Type doesn't have unary_op (or didn't handle MP_UNARY_OP_BOOL),`
	`289`	`+ // so is implicitly True as this code path is impossible to reach`
	`290`	`+ // if arg==mp_const_none.`
	`291`	`+ return mp_const_true;`
	`292`	`+ }`
`287`	`293`	`// With MP_UNARY_OP_INT, mp_unary_op() becomes a fallback for mp_obj_get_int().`
`288`	`294`	`// In this case provide a more focused error message to not confuse, e.g. chr(1.0)`
`289`	`295`	`#if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE`