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

py/objstr: strip: Don't strip "\0" by default. 

An issue was due to incorrectly taking size of default strip characters
set.
This commit is contained in:
Paul Sokolovsky 2017-09-19 21:19:23 +03:00
parent 44f0a4d1e7
commit fc9a6dd09e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/objstr.c
View File

@ -777,7 +777,7 @@ STATIC mp_obj_t str_uni_strip(int type, size_t n_args, const mp_obj_t *args) {
if (n_args == 1) { if (n_args == 1) {
chars_to_del = whitespace; chars_to_del = whitespace;
chars_to_del_len = sizeof(whitespace); chars_to_del_len = sizeof(whitespace) - 1;
} else { } else {
if (mp_obj_get_type(args[1]) != self_type) { if (mp_obj_get_type(args[1]) != self_type) {
bad_implicit_conversion(args[1]); bad_implicit_conversion(args[1]);

7
tests/basics/string_strip.py
View File

@ -32,6 +32,13 @@ print("a ".strip())
print("a ".lstrip()) print("a ".lstrip())
print("a ".rstrip()) print("a ".rstrip())
# \0 used to give a problem
print("\0abc\0".strip())
print("\0abc\0".lstrip())
print("\0abc\0".rstrip())
print("\0abc\0".strip("\0"))
# Test that stripping unstrippable string returns original object # Test that stripping unstrippable string returns original object
s = "abc" s = "abc"
print(id(s.strip()) == id(s)) print(id(s.strip()) == id(s))