summaryrefslogtreecommitdiff
path: root/py/objarray.c
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2018-09-03 21:52:35 +0300
committerDamien George <damien.p.george@gmail.com>2018-09-11 15:10:10 +1000
commit674e069ba943a5043878692205d3887ad77cb6a1 (patch)
treedeaf2edba8c2238776f1cf89ebbec2dc2844bcf1 /py/objarray.c
parentb6ebb4f04e45e5db597ad32ab25cdc60261eabd2 (diff)
py/objarray: bytearray: Allow 2nd/3rd arg to constructor.
If bytearray is constructed from str, a second argument of encoding is required (in CPython), and third arg of Unicode error handling is allowed, e.g.: bytearray("str", "utf-8", "strict") This is similar to bytes: bytes("str", "utf-8", "strict") This patch just allows to pass 2nd/3rd arguments to bytearray, but doesn't try to validate them to not impact code size. (This is also similar to how bytes constructor is handled, though it does a bit more validation, e.g. check that in case of str arg, encoding argument is passed.)
Diffstat (limited to 'py/objarray.c')
-rw-r--r--py/objarray.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/py/objarray.c b/py/objarray.c
index 56038a7d6..bdef34135 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -175,7 +175,8 @@ STATIC mp_obj_t array_make_new(const mp_obj_type_t *type_in, size_t n_args, size
#if MICROPY_PY_BUILTINS_BYTEARRAY
STATIC mp_obj_t bytearray_make_new(const mp_obj_type_t *type_in, size_t n_args, size_t n_kw, const mp_obj_t *args) {
(void)type_in;
- mp_arg_check_num(n_args, n_kw, 0, 1, false);
+ // Can take 2nd/3rd arg if constructs from str
+ mp_arg_check_num(n_args, n_kw, 0, 3, false);
if (n_args == 0) {
// no args: construct an empty bytearray