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).
This commit is contained in:
parent
eb2784e8a2
commit
3d25d9c7d9
|
@ -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) {
|
||||
|
|
|
@ -16,6 +16,17 @@ for needle in [haystack[:i+1] for i in range(len(haystack))]:
|
|||
print(haystack, "in", needle, "::", haystack in needle)
|
||||
print(haystack, "not in", needle, "::", haystack not in needle)
|
||||
|
||||
# containment of bytes/ints in bytes
|
||||
print(b'' in b'123')
|
||||
print(b'0' in b'123', b'1' in b'123')
|
||||
print(48 in b'123', 49 in b'123')
|
||||
|
||||
# containment of int in str is an error
|
||||
try:
|
||||
1 in '123'
|
||||
except TypeError:
|
||||
print('TypeError')
|
||||
|
||||
# until here, the tests would work without the 'second attempt' iteration thing.
|
||||
|
||||
for i in 1, 2:
|
||||
|
|
Loading…
Reference in New Issue