X-Git-Url: https://git.korewanetadesu.com/?p=python-collate.git;a=blobdiff_plain;f=collate%2Ficu%2F__init__.py;h=6f9647e4141c3238e456a0acdd40a4057da81638;hp=eeee418070483d0797b63b639d1aa7bca219442e;hb=2a37219e2d9c0fe58e78d987a21f6e37cfd33940;hpb=dd764628164dd6f23c1ec98a13184ce7c69fa40f

diff --git a/collate/icu/__init__.py b/collate/icu/__init__.py
index eeee418..6f9647e 100644
--- a/collate/icu/__init__.py
+++ b/collate/icu/__init__.py
@@ -11,22 +11,36 @@ Avoid this backend if...
 
 """
 
-import collate.icu._ucol
 import collate._abcollator
 import collate._locale
 import collate.errors
 
+from collate.icu import _icu
+
 class Collator(collate._abcollator.Collator):
     """ICU-based collation."""
 
     def __init__(self, locale, encoding=None):
         locale, encoding = collate._locale.getpair(locale, encoding)
-        self._collator = collate.icu._ucol.Collator(locale)
+        icu_locale = "root" if locale == "C" else locale
+        self._collator = _icu.Collator(icu_locale)
         self.locale = self._collator.locale
         self.encoding = collate._locale.encoding(encoding)
         if self._collator.used_default_information and locale != "C":
             raise collate.errors.InvalidLocaleError(locale)
 
+        try:
+            self._breaker = _icu.WordBreaker(icu_locale)
+        except ValueError:
+            # Thai is the only language with a special break locale,
+            # so this is a harmless error.
+            self._breaker = _icu.WordBreaker("root")
+
+    def words(self, string):
+        if isinstance(string, str):
+            string = string.decode(self.encoding, 'replace')
+        return filter(lambda u: not u.isspace(), self._breaker.words(string))
+
     def key(self, string):
         """Sort key for a string.
 
@@ -47,5 +61,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)