X-Git-Url: https://git.korewanetadesu.com/?p=python-collate.git;a=blobdiff_plain;f=collate%2Ficu%2F__init__.py;h=6d27a6fa95cf2b2690d1a2f50174e4819bc27dc1;hp=e7dfe2d9c1d47cfe65bbd442fef67da1ca522c21;hb=308778ae560a3258a55d578b1dd52d030ce4399d;hpb=f854c6958fd98bc3a1709e7aa1ede1ce7f5ab612

diff --git a/collate/icu/__init__.py b/collate/icu/__init__.py
index e7dfe2d..6d27a6f 100644
--- a/collate/icu/__init__.py
+++ b/collate/icu/__init__.py
@@ -41,10 +41,8 @@ class Collator(collate._abcollator.Collator):
 
     def words(self, string):
         """Split the string along word boundries."""
-        if isinstance(string, str):
-            string = string.decode(self.encoding)
-        words = self._breaker.words(string)
-        return [w for w in words if not w.isspace()]
+        string = self.unicode(string)
+        return self._breaker.words(string)
 
     def key(self, string):
         """Sort key for a string.
@@ -53,7 +51,6 @@ class Collator(collate._abcollator.Collator):
         instance according to the 'encoding' attribute of the
         Collator.
         """
-        if isinstance(string, str):
-            string = string.decode(self.encoding, 'replace')
+        string = self.unicode(string)
         return self._collator.key(string)