summaryrefslogtreecommitdiff
path: root/py/objstr.c
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-08-10 22:27:52 +0100
committerDamien George <damien.p.george@gmail.com>2014-08-10 22:27:52 +0100
commit6e6bcccdc19f35ccb09c064cb444eb498c307a33 (patch)
tree80d5d3e4267ad95f52a5a364eaaf3340e5e764b9 /py/objstr.c
parent101d87da6ac24439cc0238775aba062edb7d649c (diff)
parent0c5498540b2005e39422647d2ca9cad1a4ff731b (diff)
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/objstr.c')
-rw-r--r--py/objstr.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/py/objstr.c b/py/objstr.c
index 6ec997f4b..9d3460988 100644
--- a/py/objstr.c
+++ b/py/objstr.c
@@ -472,6 +472,9 @@ STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
} else {
// sep given
+ if (mp_obj_get_type(sep) != self_type) {
+ arg_type_mixup();
+ }
uint sep_len;
const char *sep_str = mp_obj_str_get_data(sep, &sep_len);