Merge "Make mkstrip always return a string"
This commit is contained in:
@@ -767,8 +767,11 @@ def _mkstrip(s):
|
|||||||
That is, removes string's leading and trailing whitespace characters and
|
That is, removes string's leading and trailing whitespace characters and
|
||||||
replaces any sequence of whitespace characters with with a single space.
|
replaces any sequence of whitespace characters with with a single space.
|
||||||
"""
|
"""
|
||||||
if type(s) != "string":
|
t = type(s)
|
||||||
return s
|
if t == "list":
|
||||||
|
s = " ".join(s)
|
||||||
|
elif t != "string":
|
||||||
|
fail("Argument to mkstrip must be a string or list.")
|
||||||
result = ""
|
result = ""
|
||||||
was_space = False
|
was_space = False
|
||||||
for ch in s.strip().elems():
|
for ch in s.strip().elems():
|
||||||
|
Reference in New Issue
Block a user