X-Git-Url: https://git.korewanetadesu.com/?p=python-collate.git;a=blobdiff_plain;f=collate%2Ficu%2F__init__.py;h=5f3ec05f98f19d051c4c8a6beda8b14fc0968081;hp=00a15386ea1cc55f6698901d16976ffddf6c1377;hb=9a7cf6459c40d53b58634f2df56386bf52c12f7c;hpb=f73c4c6cd3ed326c5735ab33a6896697227d07e3 diff --git a/collate/icu/__init__.py b/collate/icu/__init__.py index 00a1538..5f3ec05 100644 --- a/collate/icu/__init__.py +++ b/collate/icu/__init__.py @@ -37,9 +37,11 @@ class Collator(collate._abcollator.Collator): self._breaker = _icu.WordBreaker("root") def words(self, string): + """Split the string along word boundries.""" if isinstance(string, str): - string = string.decode(self.encoding, 'replace') - return filter(lambda u: not u.isspace(), self._breaker.words(string)) + string = string.decode(self.encoding) + words = self._breaker.words(string) + return [w for w in words if not w.isspace()] def key(self, string): """Sort key for a string. @@ -61,5 +63,5 @@ class Collator(collate._abcollator.Collator): if isinstance(a, str): a = a.decode(self.encoding, 'replace') if isinstance(b, str): - b = a.decode(self.encoding, 'replace') + b = b.decode(self.encoding, 'replace') return self._collator.cmp(a, b)