djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py: str.join can now take arbitrary iterable as argument.

Browse Source
This commit is contained in:
Damien George 2014-04-09 19:17:53 +01:00
parent 13d6739cc7
commit a157e4caba
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
py/objstr.c
View File

@ -329,17 +329,19 @@ STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
mp_obj_t *seq_items; mp_obj_t *seq_items;
if (MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) { if (MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) {
mp_obj_tuple_get(arg, &seq_len, &seq_items); mp_obj_tuple_get(arg, &seq_len, &seq_items);
} else if (MP_OBJ_IS_TYPE(arg, &mp_type_list)) {
mp_obj_list_get(arg, &seq_len, &seq_items);
} else { } else {
goto bad_arg; if (!MP_OBJ_IS_TYPE(arg, &mp_type_list)) {
// arg is not a list, try to convert it to one
arg = mp_type_list.make_new((mp_obj_t)&mp_type_list, 1, 0, &arg);
}
mp_obj_list_get(arg, &seq_len, &seq_items);
} }
// count required length // count required length
int required_len = 0; int required_len = 0;
for (int i = 0; i < seq_len; i++) { for (int i = 0; i < seq_len; i++) {
if (!MP_OBJ_IS_STR(seq_items[i])) { if (!MP_OBJ_IS_STR(seq_items[i])) {
goto bad_arg; nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "join expected a list of str's"));
} }
if (i > 0) { if (i > 0) {
required_len += sep_len; required_len += sep_len;
@ -363,9 +365,6 @@ STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
// return joined string // return joined string
return mp_obj_str_builder_end(joined_str); return mp_obj_str_builder_end(joined_str);
bad_arg:
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "?str.join expecting a list of str's"));
} }
#define is_ws(c) ((c) == ' ' || (c) == '\t') #define is_ws(c) ((c) == ' ' || (c) == '\t')

12
tests/basics/string-join.py Normal file
View File

@ -0,0 +1,12 @@
print(','.join(()))
print(','.join(('a',)))
print(','.join(('a', 'b')))
print(','.join([]))
print(','.join(['a']))
print(','.join(['a', 'b']))
print(''.join(''))
print(''.join('abc'))
print(','.join('abc'))
print(','.join('abc' for i in range(5)))