From 1610d06bb438961722c558bd695d6964c76cc080 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Mon, 14 Oct 2019 19:59:23 -0700 Subject: Switch arg check back to allow ignored args for strings --- py/objstr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'py') diff --git a/py/objstr.c b/py/objstr.c index 853868d21..fde264681 100644 --- a/py/objstr.c +++ b/py/objstr.c @@ -212,10 +212,6 @@ STATIC mp_obj_t bytes_make_new(const mp_obj_type_t *type_in, size_t n_args, cons return mp_const_empty_bytes; } - if (n_args > 1) { - goto wrong_args; - } - if (MP_OBJ_IS_STR(args[0])) { if (n_args < 2 || n_args > 3) { goto wrong_args; @@ -242,6 +238,10 @@ STATIC mp_obj_t bytes_make_new(const mp_obj_type_t *type_in, size_t n_args, cons return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); } + if (n_args > 1) { + goto wrong_args; + } + // check if __bytes__ exists, and if so delegate to it mp_obj_t dest[2]; mp_load_method_maybe(args[0], MP_QSTR___bytes__, dest); -- cgit v1.2.3