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

py/objstr: Make string formatting 8-bit clean.

This commit is contained in:
Damien George 2015-08-26 15:29:49 +01:00
parent 1d350b8ac6
commit 51b9a0d0c4
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
py/objstr.c
View File

@ -851,7 +851,7 @@ mp_obj_t mp_obj_str_format(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwa
if (*str == '}') {
str++;
if (str < top && *str == '}') {
vstr_add_char(&vstr, '}');
vstr_add_byte(&vstr, '}');
continue;
}
if (MICROPY_ERROR_REPORTING == MICROPY_ERROR_REPORTING_TERSE) {
@ -862,13 +862,13 @@ mp_obj_t mp_obj_str_format(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwa
}
}
if (*str != '{') {
vstr_add_char(&vstr, *str);
vstr_add_byte(&vstr, *str);
continue;
}
str++;
if (str < top && *str == '{') {
vstr_add_char(&vstr, '{');
vstr_add_byte(&vstr, '{');
continue;
}
@ -881,7 +881,7 @@ mp_obj_t mp_obj_str_format(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwa
if (str < top && *str != '}' && *str != '!' && *str != ':') {
field_name = vstr_new();
while (str < top && *str != '}' && *str != '!' && *str != ':') {
vstr_add_char(field_name, *str++);
vstr_add_byte(field_name, *str++);
}
}
@ -911,7 +911,7 @@ mp_obj_t mp_obj_str_format(mp_uint_t n_args, const mp_obj_t *args, mp_map_t *kwa
if (*str != '}') {
format_spec = vstr_new();
while (str < top && *str != '}') {
vstr_add_char(format_spec, *str++);
vstr_add_byte(format_spec, *str++);
}
}
}
@ -1290,14 +1290,14 @@ STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, mp_uint_t n_args, const mp_o
for (const byte *top = str + len; str < top; str++) {
mp_obj_t arg = MP_OBJ_NULL;
if (*str != '%') {
vstr_add_char(&vstr, *str);
vstr_add_byte(&vstr, *str);
continue;
}
if (++str >= top) {
break;
}
if (*str == '%') {
vstr_add_char(&vstr, '%');
vstr_add_byte(&vstr, '%');
continue;
}

4
tests/unicode/unicode_str_format.py Normal file
View File

@ -0,0 +1,4 @@
# test handling of unicode chars in format strings
print('α'.format())
print('{α}'.format(α=1))

3
tests/unicode/unicode_str_modulo.py Normal file
View File

@ -0,0 +1,3 @@
# test handling of unicode chars in string % formatting
print('α' % ())