Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make normalizeWhitespace remove \r as well.

This commit is contained in:
Valentin Lorentz 2015-08-30 15:43:50 +02:00
parent 9fba7668ec
commit c587900c6f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/utils/str.py
View File

@ -93,10 +93,11 @@ def normalizeWhitespace(s, removeNewline=True):
"""Normalizes the whitespace in a string; \s+ becomes one space."""
if not s:
return str(s) # not the same reference
starts_with_space = (s[0] in ' \n\t')
ends_with_space = (s[-1] in ' \n\t')
starts_with_space = (s[0] in ' \n\t\r')
ends_with_space = (s[-1] in ' \n\t\r')
if removeNewline:
s = ' '.join(filter(bool, s.split('\n')))
newline_re = re.compile('[\r\n]+')
s = ' '.join(filter(bool, newline_re.split(s)))
s = ' '.join(filter(bool, s.split('\t')))
s = ' '.join(filter(bool, s.split(' ')))
if starts_with_space:

1
test/test_utils.py
View File

@ -369,6 +369,7 @@ class StrTest(SupyTestCase):
self.assertEqual(f('foo bar'), 'foo bar')
self.assertEqual(f('foo\nbar'), 'foo bar')
self.assertEqual(f('foo\tbar'), 'foo bar')
self.assertEqual(f('foo\rbar'), 'foo bar')
def testNItems(self):
nItems = utils.str.nItems