From 3d25d9c7d96f9a54ad510391901af8f5bd82b306 Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 9 Aug 2017 21:25:48 +1000 Subject: py/objstr: Raise an exception for wrong type on RHS of str binary op. The main case to catch is invalid types for the containment operator, of the form str.__contains__(non-str). --- py/objstr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'py') diff --git a/py/objstr.c b/py/objstr.c index ddad7d3bd..cc3dda59e 100644 --- a/py/objstr.c +++ b/py/objstr.c @@ -347,8 +347,9 @@ mp_obj_t mp_obj_str_binary_op(mp_uint_t op, mp_obj_t lhs_in, mp_obj_t rhs_in) { rhs_data = bufinfo.buf; rhs_len = bufinfo.len; } else { - // incompatible types - return MP_OBJ_NULL; // op not supported + // LHS is str and RHS has an incompatible type + // (except if operation is EQUAL, but that's handled by mp_obj_equal) + bad_implicit_conversion(rhs_in); } switch (op) { -- cgit v1.2.3