mirror of https://github.com/fail2ban/fail2ban
closes gh-2599: fixes `splitwords` for unicode string
parent
b158f83aa3
commit
31a6c8cf5d
|
@ -291,7 +291,7 @@ def splitwords(s):
|
||||||
"""
|
"""
|
||||||
if not s:
|
if not s:
|
||||||
return []
|
return []
|
||||||
return filter(bool, map(str.strip, re.split('[ ,\n]+', s)))
|
return filter(bool, map(lambda v: v.strip(), re.split('[ ,\n]+', s)))
|
||||||
|
|
||||||
if sys.version_info >= (3,5):
|
if sys.version_info >= (3,5):
|
||||||
eval(compile(r'''if 1:
|
eval(compile(r'''if 1:
|
||||||
|
|
|
@ -66,6 +66,8 @@ class HelpersTest(unittest.TestCase):
|
||||||
self.assertEqual(splitwords(' 1, 2 , '), ['1', '2'])
|
self.assertEqual(splitwords(' 1, 2 , '), ['1', '2'])
|
||||||
self.assertEqual(splitwords(' 1\n 2'), ['1', '2'])
|
self.assertEqual(splitwords(' 1\n 2'), ['1', '2'])
|
||||||
self.assertEqual(splitwords(' 1\n 2, 3'), ['1', '2', '3'])
|
self.assertEqual(splitwords(' 1\n 2, 3'), ['1', '2', '3'])
|
||||||
|
# string as unicode:
|
||||||
|
self.assertEqual(splitwords(u' 1\n 2, 3'), ['1', '2', '3'])
|
||||||
|
|
||||||
|
|
||||||
if sys.version_info >= (2,7):
|
if sys.version_info >= (2,7):
|
||||||
|
|
Loading…
Reference in New Issue