djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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 #5677.
This commit is contained in:
Jim Mussared 2020-02-20 22:30:49 +11:00 committed by Damien George
parent 14b853eae0
commit 4e39ff221a
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
py/runtime.c
View File

@ -284,6 +284,12 @@ mp_obj_t mp_unary_op(mp_unary_op_t op, mp_obj_t arg) {
return result; 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(). // 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) // 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 #if MICROPY_ERROR_REPORTING <= MICROPY_ERROR_REPORTING_TERSE

7
tests/basics/unary_op.py
View File

@ -23,5 +23,12 @@ print(not A())
# check user instances derived from builtins # check user instances derived from builtins
class B(int): pass class B(int): pass
print(not B()) print(not B())
print(True if B() else False)
class C(list): pass class C(list): pass
print(not C()) 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)